Fedora 28 Mass Merge into rhel-8.0 - fed_hash: 1aacd25679

.gitignore

@@ -1 +1 @@
-/usbutils-008.tar.xz
+/usbutils-*.tar.xz

sources

@@ -1 +1 @@
-2780b6ae21264c888f8f30fb2aab1259  usbutils-008.tar.xz
+SHA512 (usbutils-009.tar.xz) = e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a

usbutils-006-hwdata.patch

@@ -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"

usbutils-make-hwdata.patch

@@ -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 \

usbutils.spec

@@ -1,16 +1,12 @@
 Name:    usbutils
 Summary: Linux USB utilities
-Version: 008
+Version: 009
-Release: 9%{?dist}
+Release: 2%{?dist}
 URL:     http://www.linux-usb.org/
 License: GPLv2+
-Group:   Applications/System
 
 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
@@ -21,7 +17,6 @@ USB bus.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
@@ -29,7 +24,7 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm -rf %{buildroot}/%{_datadir}/pkgconfig/usbutils.pc
+rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
 
 %files
 %{!?_licensedir:%global license %%doc}
@@ -39,6 +34,12 @@ rm -rf %{buildroot}/%{_datadir}/pkgconfig/usbutils.pc
 %{_bindir}/*
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 009-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Dec  4 2017 Peter Robinson <pbrobinson@fedoraproject.org> 009-1
+- New 009 release
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild