SPECS: hwdata.spec - 0.177, use usb.ids from usbutils

[glen]

Author: glen                         Date: Wed May 17 22:34:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.177, use usb.ids from usbutils

---- Files affected:
SPECS:
   hwdata.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/hwdata.spec
diff -u SPECS/hwdata.spec:1.12 SPECS/hwdata.spec:1.13
--- SPECS/hwdata.spec:1.12	Mon Oct 17 04:22:28 2005
+++ SPECS/hwdata.spec	Thu May 18 00:34:13 2006
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
-# TODO: use system {usb,pci}.ids (or symlink them)?
 Summary:	Hardware identification and configuration data
 Summary(pl):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
-Version:	0.169
+Version:	0.177
 Release:	1
 License:	GPL/XFree86
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	98838e0f541b362cb3bd129984ba0c2a
+# Source0-md5:	daa4c324ec57a56ff802fe01010bf849
 Requires:	pciutils
+Requires:	usbutils
 Conflicts:	Xconfigurator < 4.9.42-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,12 +30,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-rm -f pci.ids
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -s /etc/pci.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pci.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
+rm -f $RPM_BUILD_ROOT/etc/modprobe.d/blacklist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +51,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/05/17 22:34:13  glen
+- 0.177, use usb.ids from usbutils
+
 Revision 1.12  2005/10/17 02:22:28  charles
 - updated to 0.169
 - use pci.ids from pciutils
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hwdata.spec?r1=1.12&r2=1.13&f=u