drop obsolete patches

This commit is contained in:
Peter Robinson 2017-12-04 02:52:30 +00:00
parent 3fb4ad2446
commit def3914d50
3 changed files with 0 additions and 38 deletions

View File

@ -1,13 +0,0 @@
diff --git a/lsusb.py b/lsusb.py
index 7816a5a..f18aa7f 100755
--- a/lsusb.py
+++ b/lsusb.py
@@ -18,7 +18,7 @@ warnsort = False
showeps = False
prefix = "/sys/bus/usb/devices/"
-usbids = "/usr/share/usb.ids"
+usbids = "/usr/share/hwdata/usb.ids"
esc = chr(27)
norm = esc + "[0;0m"

View File

@ -1,21 +0,0 @@
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
@@ -38,7 +38,7 @@ EXTRA_DIST = \
usbutils.pc.in
lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@
usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@
@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig
pkgconfig_DATA = usbutils.pc
usbutils.pc: $(srcdir)/usbutils.pc.in
- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \
lsusb.8 \

View File

@ -7,9 +7,6 @@ License: GPLv2+
Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
#Path to usb.ids in lsusb.py should be with /hwdata/
Patch0: usbutils-006-hwdata.patch
BuildRequires: libusbx-devel
BuildRequires: systemd-devel
Requires: hwdata
@ -20,7 +17,6 @@ USB bus.
%prep
%setup -q
%patch0 -p1
%build
%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids