From 1706bea6d4025836046c7239851d08dafa21660e Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Thu, 6 Jan 2011 12:47:24 +0100
Subject: [PATCH] update to new upstream 001

- updated usbhid-dump subproject
- usbutils: Support UVC frame-based descriptors
- usbutils: Support UVC MPEG2-TS format descriptor
- lsusb: Fix getting BOS and DEVQUAL descriptors
- lsusb: Dump the Pipe Usage desciptor
- lsusb: Fix bMaxBurst reporting
- lsusb: install into /usr/bin
- usbmisc: pull in unistd.h for readlink()
- lsusb: pull in stdlib.h for exit()
- lsusb: constify!
- usbutils: convert to libusb-1.0
- Update usbhid-dump to release 1.2
- usbutils: Fix compile error on Ubuntu 9.04
- usbutils: Make lsusb -t show USB 3.0 devices
---
 ...-hwdata.patch => usbutils-001-hwdata.patch | 14 +++++-----
 usbutils.spec                                 | 26 +++++++++++++++----
 2 files changed, 28 insertions(+), 12 deletions(-)
 rename usbutils-0.86-hwdata.patch => usbutils-001-hwdata.patch (80%)

diff --git a/usbutils-0.86-hwdata.patch b/usbutils-001-hwdata.patch
similarity index 80%
rename from usbutils-0.86-hwdata.patch
rename to usbutils-001-hwdata.patch
index 8ca03b8..7e67072 100644
--- a/usbutils-0.86-hwdata.patch
+++ b/usbutils-001-hwdata.patch
@@ -1,6 +1,6 @@
---- usbutils-0.86/Makefile.am_old	2009-09-16 11:56:26.000000000 +0200
-+++ usbutils-0.86/Makefile.am	2009-09-16 11:57:40.000000000 +0200
-@@ -1,18 +1,9 @@
+--- usbutils-001/Makefile.am	2010-11-16 23:12:53.000000000 +0100
++++ usbutils-001_hwdata/Makefile.am	2011-01-06 12:23:30.785190968 +0100
+@@ -4,18 +4,9 @@
  AM_LDFLAGS = \
  	-Wl,--as-needed
  
@@ -10,7 +10,7 @@
 -data_DATA += usb.ids.gz
 -endif
 -
- sbin_PROGRAMS = \
+ bin_PROGRAMS = \
  	lsusb
  
 -sbin_SCRIPTS = \
@@ -19,7 +19,7 @@
  bin_SCRIPTS = \
  	usb-devices
  
-@@ -26,7 +17,7 @@
+@@ -29,7 +20,7 @@
  
  lsusb_CPPFLAGS = \
  	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
@@ -28,7 +28,7 @@
  
  lsusb_LDADD = \
  	$(LIBUSB_LIBS)
-@@ -36,20 +27,11 @@
+@@ -39,20 +30,11 @@
  	usb-devices.1
  
  EXTRA_DIST = \
@@ -49,7 +49,7 @@
  lsusb.8: $(srcdir)/lsusb.8.in
  	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
  
-@@ -63,10 +45,8 @@
+@@ -66,10 +48,8 @@
  	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
  
  DISTCLEANFILES = \
diff --git a/usbutils.spec b/usbutils.spec
index 503b425..d262ea7 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,7 +1,7 @@
 Name: usbutils
-Version: 0.91
-Release: 2%{?dist}
-Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
+Version: 001
+Release: 1%{?dist}
+Source:	http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,7 +11,7 @@ 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-0.86-hwdata.patch
+Patch0: usbutils-001-hwdata.patch
 
 %description
 This package contains utilities for inspecting devices connected to a
@@ -36,7 +36,6 @@ sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUIL
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
-%{_sbindir}/*
 %{_bindir}/*
 %{_datadir}/pkgconfig/usbutils.pc
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -45,6 +44,23 @@ sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUIL
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan 06 2011 Jiri Moskovcak <jmoskovc@redhat.com> 001-1
+- new upstream release
+- updated usbhid-dump subproject
+- usbutils: Support UVC frame-based descriptors
+- usbutils: Support UVC MPEG2-TS format descriptor
+- lsusb: Fix getting BOS and DEVQUAL descriptors
+- lsusb: Dump the Pipe Usage desciptor
+- lsusb: Fix bMaxBurst reporting
+- lsusb: install into /usr/bin
+- usbmisc: pull in unistd.h for readlink()
+- lsusb: pull in stdlib.h for exit()
+- lsusb: constify!
+- usbutils: convert to libusb-1.0
+- Update usbhid-dump to release 1.2
+- usbutils: Fix compile error on Ubuntu 9.04
+- usbutils: Make lsusb -t show USB 3.0 devices
+
 * Wed Oct 27 2010 Jiri Moskovcak <jmoskovc@redhat.com> 0.91-2
 - bump release