summaryrefslogtreecommitdiffstats
path: root/redhat/tdelibs
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-20 12:03:57 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-20 12:03:57 +0200
commit06bbda3dadb71711bf129f9f17c0117e4ea3766f (patch)
tree99f205f3f30fd989e35588511606cc1a608865f4 /redhat/tdelibs
parenteab4f1879e20dbbb16bbcbc9d5ade57ae07bca01 (diff)
downloadtde-packaging-06bbda3dadb71711bf129f9f17c0117e4ea3766f.tar.gz
tde-packaging-06bbda3dadb71711bf129f9f17c0117e4ea3766f.zip
RPM Packaging: some R14 updates
Diffstat (limited to 'redhat/tdelibs')
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec14
1 files changed, 9 insertions, 5 deletions
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