diff options
-rw-r--r-- | redhat/applications/tdepowersave/tdepowersave-14.0.0.spec | 20 | ||||
-rw-r--r-- | redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec | 4 | ||||
-rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 14 |
3 files changed, 21 insertions, 17 deletions
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 070ee3021..b7e1940ef 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -139,17 +139,17 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kpowersave -%{tde_libdir}/libtdeinit_kpowersave.la -%{tde_libdir}/libtdeinit_kpowersave.so -%{tde_tdelibdir}/kpowersave.la -%{tde_tdelibdir}/kpowersave.so -%{tde_tdeappdir}/kpowersave.desktop -%{tde_datadir}/apps/kpowersave/eventsrc -%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png +%{tde_bindir}/tdepowersave +%{tde_libdir}/libtdeinit_tdepowersave.la +%{tde_libdir}/libtdeinit_tdepowersave.so +%{tde_tdelibdir}/tdepowersave.la +%{tde_tdelibdir}/tdepowersave.so +%{tde_tdeappdir}/tdepowersave.desktop +%{tde_datadir}/apps/tdepowersave/eventsrc +%{tde_datadir}/apps/tdepowersave/icons/*/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/autostart/kpowersave-autostart.desktop -%{tde_datadir}/config/kpowersaverc +%{tde_datadir}/autostart/tdepowersave-autostart.desktop +%{tde_datadir}/config/tdepowersaverc %changelog diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index 504f07424..c224832e9 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -17,7 +17,7 @@ Name: trinity-libart-lgpl Version: 2.3.22 -Release: 1%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: Library of functions for 2D graphics - runtime files @@ -144,7 +144,7 @@ autoreconf -fiv %build -unset QTDIR +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index dbb62c2ea..e0090666a 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -33,7 +33,9 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +# Fix FTBFS Patch0: tdelibs-14.0.0-ftbfs.patch +# Fix categories in T-menu Patch1: tdelibs-14.0.0-fix_xdg_menu.patch # Fix battery charge detection Patch2: tdelibs-14.0.0-fix_battery_charge.patch @@ -43,9 +45,6 @@ Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch Patch102: tdelibs-14.0.0-cups_by_default.patch -# Fix battery charge detection -Patch3: tdelibs-14.0.0-fix_battery_charge.patch - Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} Obsoletes: trinity-kdelibs < %{version}-%{release} @@ -108,10 +107,15 @@ BuildRequires: bzip2-devel # UDEV support BuildRequires: libudev-devel -# UDISKS2 support +# UDISKS support +Requires: udisks BuildRequires: udisks-devel -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} + +# UDISKS2 support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_udisks2 1 +Requires: udisks2 +BuildRequires: udisks2-devel %endif # UTEMPTER support |