[packages/hwdata] usbutils usb.ids data moved to hwdata package

[glen]

commit 2f80ccdfad71729eed7eb41a4d075d0af77ede33
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 20 00:12:17 2013 +0200

    usbutils usb.ids data moved to hwdata package

 hwdata.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index f9b6ca0..fcd8461 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,7 +1,7 @@
 # TODO
-# - make this primary db of pci/usb/oui/pnp/blacklist db (merge usbutils, ieee-oui, pnputils, kmod/module-init-tools) ?
+# - make this primary db of oui/pnp/blacklist db (merge ieee-oui, pnputils, kmod/module-init-tools) ?
 # - merge (switch?) with http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/hwids ?
-#   their db contains Hardware (PCI, USB, OUI, IAB) IDs databases: https://github.com/gentoo/hwids
+#   their db contains also OUI, IAB IDs databases: https://github.com/gentoo/hwids
 Summary:	Hardware identification and configuration data
 Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
@@ -14,9 +14,9 @@ Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
 # Source0-md5:	98615d098bafb7bad1ae5912c073edc7
 Requires:	ieee-oui
 Requires:	pnputils
-Requires:	usbutils
 Conflicts:	Xconfigurator < 4.9.42-1
 Conflicts:	pciutils < 3.1.10-3
+Conflicts:	usbutils < 006-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,7 +39,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_sysconfdir}/usb.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/usb.ids
 ln -sf %{_datadir}/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/hwdata/pnp.ids
 ln -sf %{_datadir}/oui.txt $RPM_BUILD_ROOT%{_datadir}/hwdata/oui.txt
 %{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hwdata.git/commitdiff/009264105ee69b6840095d23257962739de93432