From fe14af939c68ba3594e760c8885b66c752d922ce Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Jun 17 2013 10:33:30 +0000
Subject: usbutils-007 (#971757)


---

diff --git a/.gitignore b/.gitignore
index e301ffe..4e60d73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ usbutils-0.86.tar.gz
 /usbutils-004.tar.gz
 /usbutils-005.tar.gz
 /usbutils-006.tar.gz
+/usbutils-007.tar.gz
diff --git a/sources b/sources
index a070573..aad3eff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd58e3c7a7c52354415df7e0c8d5d2ee  usbutils-006.tar.gz
+be6c42294be5c940f208190d3479d50c  usbutils-007.tar.gz
diff --git a/usbutils-006-lsub-t_loop.patch b/usbutils-006-lsub-t_loop.patch
deleted file mode 100644
index 733449c..0000000
--- a/usbutils-006-lsub-t_loop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/lsusb-t.c b/lsusb-t.c
-index 074dafb..3e29072 100644
---- a/lsusb-t.c
-+++ b/lsusb-t.c
-@@ -210,8 +210,13 @@ static void read_sysfs_file_string(const char *d_name, const char *file, char *b
- 
- static void append_dev_interface(struct usbinterface *i, struct usbinterface *new)
- {
--	while (i->next)
-+	while (i->next) {
-+		if (i == new)
-+			return;
- 		i = i->next;
-+	}
-+		if (i == new)
-+			return;
- 	i->next = new;
- }
- 
-@@ -230,8 +235,13 @@ static void append_businterface(unsigned int busnum, struct usbinterface *new)
- 		if (b->busnum == busnum) {
- 			i = b->first_interface;
- 			if (i) {
--				while (i->next)
-+				while (i->next) {
-+					if (i == new)
-+						return;
- 					i = i->next;
-+				}
-+				if (i == new)
-+					return;
- 				i->next = new;
- 			} else
- 				b->first_interface = new;
diff --git a/usbutils.spec b/usbutils.spec
index ce6fe64..488d93d 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,7 +1,7 @@
 Name: usbutils
-Version: 006
-Release: 4%{?dist}
-Source:	%{name}-%{version}.tar.gz
+Version: 007
+Release: 1%{?dist}
+Source:	https://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)
@@ -14,7 +14,6 @@ Conflicts: hotplug < 3:2002_01_14-2
 
 #Path to usb.ids in lsusb.py should be with /hwdata/
 Patch0: usbutils-006-hwdata.patch
-Patch1: usbutils-006-lsub-t_loop.patch
 
 %description
 This package contains utilities for inspecting devices connected to a
@@ -23,8 +22,6 @@ USB bus.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-./autogen.sh
 
 %build
 %configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
@@ -45,6 +42,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 17 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 007-1
+- new upstream release
+
 * Tue Feb 26 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 006-4
 - lsusb-t: make sure that interfaces are added to lists only once (#914929)