summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-12-31 11:52:04 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-12-31 11:52:04 +0100
commitc32df3ea9ed3188be0171235ea38465e122f5c34 (patch)
tree670c0cff43658ee5877051c53f3471f302cf0a15 /redhat/main
parent1474dc6a1b2785e5eaea8861ba0a16b21961d5d3 (diff)
downloadtde-packaging-c32df3ea9ed3188be0171235ea38465e122f5c34.tar.gz
tde-packaging-c32df3ea9ed3188be0171235ea38465e122f5c34.zip
RPM packaging: update tdebase
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec20
1 files changed, 11 insertions, 9 deletions
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 48875cae7..99e7baae5 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -947,9 +947,11 @@ Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release}
# Requires 'usb.ids'
-Requires: usbutils
+Requires: usbutils
+BuildRequires: usbutils
%if 0%{?suse_version} == 0
-Requires: hwdata
+BuildRequires: hwdata
+Requires: hwdata
%endif
%description -n trinity-kcontrol
@@ -3668,13 +3670,13 @@ EOF
%endif
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-%if 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 || 0%{?mgaversion} >= 4
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%else
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-%endif
+if [ -r "/usr/share/usb.ids" ]; then
+ %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+ %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+elif [ -r "/usr/share/hwdata/usb.ids" ]; then
+ %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+ %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+fi
# Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package.