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

[glen]

commit 01497d80ec10f323e71f9f7de11962575e9f112b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 23 22:12:21 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.patch  | 8 ++++----
 usbutils.spec | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/usbutils.spec b/usbutils.spec
index e4ddef3..cba85f7 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):	Linuksowe narzędzia do USB
 Summary(pt_BR.UTF-8):	Utilitários Linux USB
 Name:		usbutils
 Version:	006
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.bz2
@@ -12,15 +12,15 @@ Patch0:		hwdata.patch
 URL:		http://www.linux-usb.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	hwdata >= 0.243
+BuildRequires:	hwdata >= 0.243-2
 BuildRequires:	libtool
 BuildRequires:	libusb-devel >= 1.0.0
 BuildRequires:	pkgconfig
 BuildRequires:	zlib-devel
-Requires:	hwdata >= 0.243
+Requires:	hwdata >= 0.243-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		hwdatadir	/usr/share/hwdata
+%define		hwdatadir	/lib/hwdata
 
 %description
 usbutils contains a utility for inspecting devices connected to the
diff --git a/hwdata.patch b/hwdata.patch
index a8ab1a8..87e8280 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -7,7 +7,7 @@ index 14d9a31..a34f736 100755
  
  prefix = "/sys/bus/usb/devices/"
 -usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
++usbids = "/lib/hwdata/usb.ids"
  
  esc = chr(27)
  norm = esc + "[0;0m"
@@ -19,7 +19,7 @@ diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
  
  lsusb.8: $(srcdir)/lsusb.8.in
 -	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-+	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@
++	sed 's|VERSION|$(VERSION)|g;s|@usbids@|/lib/hwdata/usb.ids|g' $< >$@
  
  usb-devices.1: $(srcdir)/usb-devices.1.in
  	sed 's|VERSION|$(VERSION)|g' $< >$@
@@ -28,7 +28,7 @@ diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
  
  usbutils.pc: $(srcdir)/usbutils.pc.in
 -	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
-+	sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
++	sed 's|@usbids@|/lib/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
  
  DISTCLEANFILES = \
  	lsusb.8 \
@@ -39,7 +39,7 @@ diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
  	mandir:                 ${mandir}
  
 -	usb.ids:                ${datadir}/usb.ids
-+	usb.ids:                ${datadir}/hwdata/usb.ids
++	usb.ids:                /lib/hwdata/usb.ids
  	zlib:                   ${USE_ZLIB}
  
  	compiler:               ${CC}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/usbutils.git/commitdiff/01497d80ec10f323e71f9f7de11962575e9f112b