[usbutils] update to new upstream 006

[Lukáš Nykrýn]

commit ad04d9ed328f4b037d79581021669a39b5009af1
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Mon Jul 16 12:49:16 2012 +0200

    update to new upstream 006

 usbutils-003-hwdata.patch                     |   79 -------------------------
 usbutils-003-invalid-config-descriptors.patch |   50 ----------------
 usbutils-005-readlink.patch                   |   37 ------------
 usbutils-006-hwdata.patch                     |   13 ++++
 usbutils.spec                                 |   16 +++---
 5 files changed, 21 insertions(+), 174 deletions(-)
---
diff --git a/usbutils-006-hwdata.patch b/usbutils-006-hwdata.patch
new file mode 100644
index 0000000..48b8001
--- /dev/null
+++ b/usbutils-006-hwdata.patch
@@ -0,0 +1,13 @@
+diff --git a/lsusb.py b/lsusb.py
+index 14d9a31..a34f736 100755
+--- a/lsusb.py
++++ b/lsusb.py
+@@ -16,7 +16,7 @@ nohub = False
+ warnsort = False
+ 
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+ 
+ esc = chr(27)
+ norm = esc + "[0;0m"
diff --git a/usbutils.spec b/usbutils.spec
index 553e1fb..4bbca3f 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,5 +1,5 @@
 Name: usbutils
-Version: 005
+Version: 006
 Release: 1%{?dist}
 Source:	%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
@@ -11,10 +11,9 @@ BuildRequires: autoconf, libtool, libusb-devel >= 0.1.8, libusb1-devel
 Summary: Linux USB utilities
 Group: Applications/System
 Conflicts: hotplug < 3:2002_01_14-2
-Patch0: usbutils-003-hwdata.patch
-#Path to usb.ids should be with /hwdata/
-Patch1: usbutils-make-hwdata.patch
-Patch2: usbutils-005-readlink.patch
+
+#Path to usb.ids in lsusb.py should be with /hwdata/
+Patch0: usbutils-006-hwdata.patch
 
 %description
 This package contains utilities for inspecting devices connected to a
@@ -23,12 +22,10 @@ USB bus.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 ./autogen.sh
 
 %build
-%configure --sbindir=%{_sbindir}
+%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
 make %{?_smp_mflags}
 
 %install
@@ -46,6 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 16 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 006-1
+- new upstream release
+
 * Thu Apr 19 2012 Lukas Nykryn <lnykryn at redhat.com> 005-1
 - new upstream release