From def3914d50e8a0b136ed251672fe5dd4dc3ef7a3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Dec 2017 02:52:30 +0000 Subject: [PATCH] drop obsolete patches --- usbutils-006-hwdata.patch | 13 ------------- usbutils-make-hwdata.patch | 21 --------------------- usbutils.spec | 4 ---- 3 files changed, 38 deletions(-) delete mode 100644 usbutils-006-hwdata.patch delete mode 100644 usbutils-make-hwdata.patch diff --git a/usbutils-006-hwdata.patch b/usbutils-006-hwdata.patch deleted file mode 100644 index a8e3961..0000000 --- a/usbutils-006-hwdata.patch +++ /dev/null @@ -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" diff --git a/usbutils-make-hwdata.patch b/usbutils-make-hwdata.patch deleted file mode 100644 index 862c7fc..0000000 --- a/usbutils-make-hwdata.patch +++ /dev/null @@ -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 \ diff --git a/usbutils.spec b/usbutils.spec index e522130..aad6df5 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -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