RPM packaging: update tdebase

pull/3/head
François Andriot 10 years ago
parent 1474dc6a1b
commit c32df3ea9e

@ -947,9 +947,11 @@ Group: System/GUI/Other
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
# Requires 'usb.ids' # Requires 'usb.ids'
Requires: usbutils Requires: usbutils
BuildRequires: usbutils
%if 0%{?suse_version} == 0 %if 0%{?suse_version} == 0
Requires: hwdata BuildRequires: hwdata
Requires: hwdata
%endif %endif
%description -n trinity-kcontrol %description -n trinity-kcontrol
@ -3668,13 +3670,13 @@ EOF
%endif %endif
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) # 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 if [ -r "/usr/share/usb.ids" ]; then
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%else elif [ -r "/usr/share/hwdata/usb.ids" ]; then
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%endif fi
# Makes 'media_safelyremove.desktop' an alternative. # Makes 'media_safelyremove.desktop' an alternative.
# This allows the use of 'tdeio-umountwrapper' package. # This allows the use of 'tdeio-umountwrapper' package.

Loading…
Cancel
Save