summaryrefslogtreecommitdiffstats
path: root/redhat/tdelibs
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-03-16 13:00:13 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-03-16 13:00:13 +0100
commita221ed54aa985c004d35de3c9f47f575dcaafaba (patch)
tree15114e61b2c45512cf5903c2e0a498202e722c91 /redhat/tdelibs
parenta0837c0ccd4281fe21a97f284c8c06c1990d5f5e (diff)
downloadtde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.tar.gz
tde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.zip
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/tdelibs')
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec12
1 files changed, 12 insertions, 0 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index cce07d6a5..0dd0d90bd 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -36,10 +36,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Patch11: tdelibs-14.0.0-displayconfig_crash.patch
+Patch12: tdelibs-14.0.0-reduce_tdehwlib_cpueagerness.patch
+
# Patches from Mandriva
Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch
+# Enables the 'kddebug' feature even when built with '-DNDEBUG'
+Patch201: tdelibs-14.0.0-enable_kddebug.patch
+
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs < %{version}-%{release}
@@ -450,9 +456,14 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%patch11 -p1 -b .displayconfigcrash
+%patch12 -p1 -b .tdehwlib
+
%patch101 -p1 -b .xdg_path
%patch102 -p1 -b .cups_by_default
+#patch201 -p1 -b .kddebug
+
%build
unset QTDIR QTINC QTLIB
@@ -501,6 +512,7 @@ fi
-DWITH_TDEHWLIB_DAEMONS=ON \
%{?with_hal:-DWITH_HAL=ON} \
%{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
+ -DWITH_LOGINDPOWER=ON \
%{?!with_upower:-DWITH_UPOWER=OFF} \
%{?!with_udisks:-DWITH_UDISKS=OFF} \
%{?!with_udisks2:-DWITH_UDISKS2=OFF} \