commit d5e26d75588dc994c2a1508f1d3ef40b45ee8696
Author: Jakub Bogusz <[email protected]>
Date: Thu Oct 23 21:24:05 2014 +0200
- updated to 008 (this version relies on udev hwdb, no longer supports
plain usb.ids)
hwdata.patch | 28 ++++++++++++++++++++++------
usbutils.spec | 29 +++++++----------------------
2 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/usbutils.spec b/usbutils.spec
index 064f6f8..e417d8f 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,29 +1,26 @@
-#
-# Conditional build:
-%bcond_with hwdata_check # check hwdata usb.ids freshness
-#
Summary: Linux USB utilities
Summary(pl.UTF-8): Linuksowe narzędzia do USB
Summary(pt_BR.UTF-8): Utilitários Linux USB
Name: usbutils
-Version: 007
+Version: 008
Release: 1
License: GPL v2+
Group: Applications/System
-Source0:
http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
-# Source0-md5: c9df5107ae9d26b10a1736a261250139
+Source0:
https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
+# Source0-md5: 2780b6ae21264c888f8f30fb2aab1259
Patch0: hwdata.patch
URL: http://www.linux-usb.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
-%{?with_hwdata_check:BuildRequires: hwdata >= 0.249}
BuildRequires: libtool
BuildRequires: libusb-devel >= 1.0.0
BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
+BuildRequires: udev-devel >= 1:196
BuildRequires: xz
BuildRequires: zlib-devel
Requires: hwdata >= 0.249
+Requires: udev-core >= 1:196
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define hwdatadir /lib/hwdata
@@ -31,14 +28,11 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
usbutils contains a utility for inspecting devices connected to the
-USB bus. It requires a Linux kernel version 2.3.15 or newer
-(supporting the '/proc/bus/usb' interface) or patched PLD's 2.2
-kernel.
+USB bus.
%description -l pl.UTF-8
Pakiet usbutils zawiera narzędzie do przeglądania urządzeń
-podłączonych do szyny USB. Wymaga jądra w werji 2.3.15 lub nowszej (z
-obsługą interfejsu /proc/bus/usb) lub jądra 2.2 z PLD.
+podłączonych do szyny USB.
%description -l pt_BR.UTF-8
Este pacote contém utilitários para inspecionar dispositivos
@@ -48,15 +42,6 @@ conectados a um barramento USB.
%setup -q
%patch0 -p1
-%if %{with hwdata_check}
-# paranoid check whether usb.ids in system isn't too old
-if [ usb.ids -nt %{hwdatadir}/usb.ids ]; then
- : usb.ids needs to be updated
- exit 1
-fi
-%endif
-%{__rm} usb.ids
-
%build
%{__libtoolize}
%{__aclocal}
diff --git a/hwdata.patch b/hwdata.patch
index 87e8280..aaffba0 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -1,9 +1,7 @@
-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
+--- usbutils-008/lsusb.py.orig 2014-10-21 22:30:11.000000000 +0200
++++ usbutils-008/lsusb.py 2014-10-23 20:24:27.476493932 +0200
+@@ -18,7 +18,7 @@
+ showeps = False
prefix = "/sys/bus/usb/devices/"
-usbids = "/usr/share/usb.ids"
@@ -11,6 +9,24 @@ index 14d9a31..a34f736 100755
esc = chr(27)
norm = esc + "[0;0m"
+@@ -96,7 +96,7 @@
+ return True
+
+ def parse_usb_ids():
+- "Parse /usr/share/usb.ids and fill usbvendors, usbproducts, usbclasses"
++ "Parse /lib/hwdata/usb.ids and fill usbvendors, usbproducts, usbclasses"
+ id = 0
+ sid = 0
+ mode = 0
+@@ -520,7 +520,7 @@
+ print " -c use colors"
+ print " -e display endpoint info"
+ print " -w display warning if usb.ids is not sorted correctly"
+- print " -f FILE override filename for /usr/share/usb.ids"
++ print " -f FILE override filename for /lib/hwdata/usb.ids"
+ print "Use lsusb.py -ciu to get a nice overview of your USB devices."
+ return 2
+
diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
--- usbutils-004/Makefile.am.orig 2011-09-20 09:42:04.282566870 +0200
+++ usbutils-004/Makefile.am 2011-09-20 09:42:41.399102845 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usbutils.git/commitdiff/d5e26d75588dc994c2a1508f1d3ef40b45ee8696
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
