[usbutils: 2/2] update to new upstream 005

[Lukáš Nykrýn]

commit 71a2faac06098e3aebbd3c9ffeee0044ce13cc1e
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Thu Apr 19 10:57:27 2012 +0200

    update to new upstream 005

 .gitignore                  |    1 +
 sources                     |    2 +-
 usbutils-005-readlink.patch |   20 ++++++++++----------
 usbutils.spec               |   11 +++++++----
 4 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83da6ee..c71650d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ usbutils-0.86.tar.gz
 /usbutils-001.tar.gz
 /usbutils-003.tar.gz
 /usbutils-004.tar.gz
+/usbutils-005.tar.gz
diff --git a/sources b/sources
index f6bf952..3b82934 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-481e1de453bcabbd5f43125bb4df2ab7  usbutils-004.tar.gz
+2e990265d472e2f6f0662356d654683b  usbutils-005.tar.gz
diff --git a/usbutils-005-readlink.patch b/usbutils-005-readlink.patch
index 56d55d8..60e4315 100644
--- a/usbutils-005-readlink.patch
+++ b/usbutils-005-readlink.patch
@@ -1,30 +1,30 @@
 diff --git a/lsusb-t.c b/lsusb-t.c
-index 5438704..c8ab1b9 100644
+index a07c902..92a9830 100644
 --- a/lsusb-t.c
 +++ b/lsusb-t.c
-@@ -330,9 +330,7 @@ static void add_usb_interface(const char *d_name)
- 	l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
+@@ -335,9 +335,7 @@ static void add_usb_interface(const char *d_name)
+ 	l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
  	if (l > 0 && l < MY_PATH_MAX) {
- 		l = readlink(link, link, MY_PATH_MAX);
+ 		l = readlink(driver, driver, MY_PATH_MAX);
 -		if (l < 0)
 -			perror(d_name);
 -		else {
 +		if (l >= 0) {
  			if (l < MY_PATH_MAX - 1)
- 				link[l] = '\0';
+ 				driver[l] = '\0';
  			else
-@@ -395,9 +393,7 @@ static void add_usb_device(const char *d_name)
- 	l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
+@@ -400,9 +398,7 @@ static void add_usb_device(const char *d_name)
+ 	l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
  	if (l > 0 && l < MY_PATH_MAX) {
- 		l = readlink(link, link, MY_PATH_MAX);
+ 		l = readlink(driver, driver, MY_PATH_MAX);
 -		if (l < 0)
 -			perror(d_name);
 -		else {
 +		if (l >= 0) {
  			if (l < MY_PATH_MAX - 1)
- 				link[l] = '\0';
+ 				driver[l] = '\0';
  			else
-@@ -418,9 +414,7 @@ static void get_roothub_driver(struct usbbusnode *b, const char *d_name)
+@@ -423,9 +419,7 @@ static void get_roothub_driver(struct usbbusnode *b, const char *d_name)
  	l = snprintf(path, MY_PATH_MAX, "%s/%s/../driver", sys_bus_usb_devices, d_name);
  	if (l > 0 && l < MY_PATH_MAX) {
  		l = readlink(path, path, MY_PATH_MAX);
diff --git a/usbutils.spec b/usbutils.spec
index 8927d3c..553e1fb 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,7 +1,7 @@
 Name: usbutils
-Version: 004
-Release: 4%{?dist}
-Source:	http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
+Version: 005
+Release: 1%{?dist}
+Source:	%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +25,7 @@ USB bus.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-autoreconf
+./autogen.sh
 
 %build
 %configure --sbindir=%{_sbindir}
@@ -46,6 +46,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 19 2012 Lukas Nykryn <lnykryn at redhat.com> 005-1
+- new upstream release
+
 * Thu Apr 19 2012 Lukas Nykryn <lnykryn at redhat.com> 004-4
 - Ignore missing driver symlink (#808934)