[packages/hwdata] use /lib/hwdata for early boot access

[glen]

commit b9f6b63d8018af15f60cab794cdb477a1651bd72
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 22 18:50:02 2013 +0200

    use /lib/hwdata for early boot access
    
    http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-January/023401.html
    see https://github.com/pld-linux/pciutils/commit/5d206b802d827811d3ca63318235043814aae8f0
    also https://github.com/pld-linux/usbutils/commit/aac6f346272d0f54f946ed723d813ec9ee720967

 hwdata.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/hwdata.spec b/hwdata.spec
index 22bbca9..bdf5a77 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8):	Dane do identyfikacji i konfiguracji sprzętu
 Name:		hwdata
 # see hwdata.spec inside of tarball
 Version:	0.243
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
@@ -15,11 +15,13 @@ Source0:	https://fedorahosted.org/releases/h/w/hwdata/%{name}-%{version}.tar.bz2
 Requires:	ieee-oui
 Requires:	pnputils
 Conflicts:	Xconfigurator < 4.9.42-1
-Conflicts:	pciutils < 3.1.10-3
-Conflicts:	usbutils < 006-2
+Conflicts:	pciutils < 3.1.10-6
+Conflicts:	usbutils < 006-3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_datadir	/lib
+
 %description
 hwdata contains various hardware identification and configuration
 data, such as pci.ids, usb.ids, oui.txt and pnp.ids databases.
@@ -39,8 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_datadir}/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/%{name}/pnp.ids
-ln -sf %{_datadir}/oui.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/oui.txt
+ln -sf /usr/share/misc/pnp.ids $RPM_BUILD_ROOT%{_datadir}/%{name}/pnp.ids
+ln -sf /usr/share/oui.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/oui.txt
 %{__rm} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 
 gzip -9 $RPM_BUILD_ROOT%{_datadir}/%{name}/pci.ids
================================================================

---- gitweb:

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