[packages/hwdata] use pnp.ids from pnputils package
glen
glen at pld-linux.org
Tue Jan 15 15:40:20 CET 2013
commit 7ecd8233f95a6215c4dadb50cdc2c579f6126725
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Jan 15 16:38:04 2013 +0200
use pnp.ids from pnputils package
hwdata.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index b3edc36..2d5d8d9 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -14,6 +14,7 @@ Source0: https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
# Source0-md5: 32dd541d778cfe0dd6100f88433bbc90
Requires: pciutils
Requires: usbutils
+Requires: pnputils
Conflicts: Xconfigurator < 4.9.42-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,8 +38,9 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-ln -sf %{_sysconfdir}/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.ids
-ln -sf %{_sysconfdir}/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
+ln -sf /etc/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.ids
+ln -sf /etc/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
+ln -sf /usr/share/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pnp.ids
%{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
%clean
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hwdata.git/commitdiff/0fdf1ddca9bfbcd1aa251e470e09d461faebce99
More information about the pld-cvs-commit
mailing list