commit 39ed4beca1d1a60f719a7470d125c192dfbdbfb1
Author: Jakub Bogusz <[email protected]>
Date: Sun Jun 2 08:16:06 2019 +0200
- updated to 012
- updated hwdata patch
- removed obsolete python3 patch
hwdata.patch | 18 +++---
usbutils-python3.patch | 145 -------------------------------------------------
usbutils.spec | 19 ++++---
3 files changed, 21 insertions(+), 161 deletions(-)
---
diff --git a/usbutils.spec b/usbutils.spec
index e93c61c..983da3b 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -3,19 +3,18 @@ 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: 010
+Version: 012
Release: 1
License: GPL v2+
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
-# Source0-md5: 938e3707593974be99a0dd6d1de76671
+# Source0-md5: 0da98eb80159071fdbb00905390509d9
Patch0: hwdata.patch
-Patch1: %{name}-python3.patch
URL: http://www.linux-usb.org/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.9
BuildRequires: libtool
-BuildRequires: libusb-devel >= 1.0.9
+BuildRequires: libusb-devel >= 1.0.14
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.507
BuildRequires: sed >= 4.0
@@ -23,7 +22,7 @@ BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel >= 1:196
BuildRequires: xz
BuildRequires: zlib-devel
-Requires: libusb >= 1.0.9
+Requires: libusb >= 1.0.14
Requires: udev-core >= 1:196
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,7 +53,6 @@ Program lsusb napisany w Pythonie.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' lsusb.py.in
@@ -63,6 +61,13 @@ Program lsusb napisany w Pythonie.
%{__autoconf}
%{__autoheader}
%{__automake}
+cd usbhid-dump
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
%configure \
--disable-silent-rules
%{__make}
diff --git a/hwdata.patch b/hwdata.patch
index 24ce2e9..d48e434 100644
--- a/hwdata.patch
+++ b/hwdata.patch
@@ -1,13 +1,13 @@
---- usbutils-010/lsusb.py.in.orig 2018-05-20 16:28:37.757075652 +0200
-+++ usbutils-010/lsusb.py.in 2018-05-20 16:30:24.147074439 +0200
-@@ -519,7 +519,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 " + usbids)
+--- usbutils-012/lsusb.py.in.orig 2019-06-01 22:20:08.590192363 +0200
++++ usbutils-012/lsusb.py.in 2019-06-02 07:21:55.317421635 +0200
+@@ -463,7 +463,7 @@
+ print(" -C, --no-color disable colors")
+ print(" -e, --endpoints display endpoint info")
+ print(" -f FILE, --usbids-path FILE")
+- print(" override filename for
/usr/share/usb.ids")
++ print(" override filename for " + usbids)
+ print()
print("Use lsusb.py -ciu to get a nice overview of your USB devices.")
- return 2
--- usbutils-010/Makefile.am.orig 2018-05-15 15:45:26.000000000 +0200
+++ usbutils-010/Makefile.am 2018-05-20 15:33:58.907113099 +0200
diff --git a/usbutils-python3.patch b/usbutils-python3.patch
deleted file mode 100644
index c95bb73..0000000
--- a/usbutils-python3.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From a7c25eadbc998bf359e5b7dac03aaea8c30d2932 Mon Sep 17 00:00:00 2001
-From: Georg Brandl <[email protected]>
-Date: Thu, 17 May 2018 08:51:27 +0200
-Subject: [PATCH] lsusb.py: fix up Python 3 conversion
-
-- Use open() and ignore encoding errors
-- Replace removed __cmp__ by rich comparison methods
-- Convert commented-out print statements, remove unused future import
-
-Fixes #68
----
- lsusb.py.in | 50 ++++++++++++++++++++++----------------------------
- 1 file changed, 22 insertions(+), 28 deletions(-)
-
-diff --git a/lsusb.py.in b/lsusb.py.in
-index 0f4d318..083b512 100644
---- a/lsusb.py.in
-+++ b/lsusb.py.in
-@@ -12,8 +12,6 @@
-
- import os, sys, re, getopt
-
--# from __future__ import print_function
--
- # Global options
- showint = False
- showhubint = False
-@@ -53,15 +51,12 @@ class UsbClass:
- self.desc = str
- def __repr__(self):
- return self.desc
-- def __cmp__(self, oth):
-- # Works only on 64bit systems:
-- #return self.pclass*0x10000+self.subclass*0x100+self.proto \
-- # - oth.pclass*0x10000-oth.subclass*0x100-oth.proto
-- if self.pclass != oth.pclass:
-- return self.pclass - oth.pclass
-- if self.subclass != oth.subclass:
-- return self.subclass - oth.subclass
-- return self.proto - oth.proto
-+ def __lt__(self, oth):
-+ return (self.pclass, self.subclass, self.proto) < \
-+ (oth.pclass, oth.subclass, oth.proto)
-+ def __eq__(self, oth):
-+ return (self.pclass, self.subclass, self.proto) == \
-+ (oth.pclass, oth.subclass, oth.proto)
-
- class UsbVendor:
- "Container for USB Vendors"
-@@ -70,8 +65,10 @@ class UsbVendor:
- self.vname = vname
- def __repr__(self):
- return self.vname
-- def __cmp__(self, oth):
-- return self.vid - oth.vid
-+ def __lt__(self, oth):
-+ return self.vid < oth.vid
-+ def __eq__(self, oth):
-+ return self.vid == oth.vid
-
- class UsbProduct:
- "Container for USB VID:PID devices"
-@@ -81,13 +78,10 @@ class UsbProduct:
- self.pname = pname
- def __repr__(self):
- return self.pname
-- def __cmp__(self, oth):
-- # Works only on 64bit systems:
-- # return self.vid*0x10000 + self.pid \
-- # - oth.vid*0x10000 - oth.pid
-- if self.vid != oth.vid:
-- return self.vid - oth.vid
-- return self.pid - oth.pid
-+ def __lt__(self, oth):
-+ return (self.vid, self.pid) < (oth.vid, oth.pid)
-+ def __eq__(self, oth):
-+ return (self.vid, self.pid) == (oth.vid, oth.pid)
-
- usbvendors = []
- usbproducts = []
-@@ -107,7 +101,7 @@ def parse_usb_ids():
- mode = 0
- strg = ""
- cstrg = ""
-- for ln in file(usbids, "r").readlines():
-+ for ln in open(usbids, "r", errors="ignore"):
- if ln[0] == '#':
- continue
- ln = ln.rstrip('\n')
-@@ -146,7 +140,7 @@ def parse_usb_ids():
-
- def bin_search(first, last, item, list):
- "binary search on list, returns -1 on fail, match idx otherwise,
recursive"
-- #print "bin_search(%i,%i)" % (first, last)
-+ #print("bin_search(%i,%i)" % (first, last))
- if first == last:
- return -1
- if first == last-1:
-@@ -233,7 +227,7 @@ def find_dev(driver, usbname):
- for nm in devlst:
- dir = prefix + usbname
- prep = ""
-- #print nm
-+ #print(nm)
- idx = nm.find('/')
- if idx != -1:
- prep = nm[:idx+1]
-@@ -404,8 +398,8 @@ class UsbDevice:
- try:
- self.nointerfaces = int(readattr(fname,
"bNumInterfaces"))
- except:
-- #print "ERROR: %s/bNumInterfaces = %s" % (fname,
-- # readattr(fname, "bNumInterfaces"))a
-+ #print("ERROR: %s/bNumInterfaces = %s" % (fname,
-+ # readattr(fname, "bNumInterfaces")))
- self.nointerfaces = 0
- try:
- self.driver = readlink(fname, "driver")
-@@ -421,7 +415,7 @@ class UsbDevice:
- for dirent in os.listdir(prefix + self.fname):
- if not dirent[0:1].isdigit():
- continue
-- #print dirent
-+ #print(dirent)
- if os.access(prefix + dirent + "/bInterfaceClass",
os.R_OK):
- iface = UsbInterface(self, self.level+1)
- iface.read(dirent)
-@@ -532,7 +526,7 @@ def usage():
- def read_usb():
- "Read toplevel USB entries and print"
- for dirent in os.listdir(prefix):
-- #print dirent,
-+ #print(dirent)
- if not dirent[0:3] == "usb":
- continue
- usbdev = UsbDevice(None, 0)
-@@ -590,7 +584,7 @@ def main(argv):
- fix_usbclass()
- except:
- print(" WARNING: Failure to read usb.ids", file=sys.stderr)
-- #print >>sys.stderr, sys.exc_info()
-+ #print(sys.exc_info(), file=sys.stderr)
- read_usb()
-
- # Entry point
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usbutils.git/commitdiff/39ed4beca1d1a60f719a7470d125c192dfbdbfb1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
