From 19fb52973ca5b1bcbc6d40a5ca7675c17a5cdfb1 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 25 Sep 2017 13:17:17 +0000 Subject: [PATCH] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild fed_hash: 5ea2f00f7dd28eba3780c4a631e390a52c15fea0 --- .gitignore | 1 + sources | 1 + usbutils-006-hwdata.patch | 13 +++++ usbutils-make-hwdata.patch | 21 ++++++++ usbutils.spec | 101 +++++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 sources create mode 100644 usbutils-006-hwdata.patch create mode 100644 usbutils-make-hwdata.patch create mode 100644 usbutils.spec diff --git a/.gitignore b/.gitignore index e69de29..45b2edb 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/usbutils-008.tar.xz diff --git a/sources b/sources new file mode 100644 index 0000000..5d8ce25 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +2780b6ae21264c888f8f30fb2aab1259 usbutils-008.tar.xz diff --git a/usbutils-006-hwdata.patch b/usbutils-006-hwdata.patch new file mode 100644 index 0000000..a8e3961 --- /dev/null +++ b/usbutils-006-hwdata.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..862c7fc --- /dev/null +++ b/usbutils-make-hwdata.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000..c8b7263 --- /dev/null +++ b/usbutils.spec @@ -0,0 +1,101 @@ +Name: usbutils +Summary: Linux USB utilities +Version: 008 +Release: 9%{?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 + +%description +This package contains utilities for inspecting devices connected to a +USB bus. + +%prep +%setup -q +%patch0 -p1 + +%build +%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -rf %{buildroot}/%{_datadir}/pkgconfig/usbutils.pc + +%files +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS NEWS README +%{_mandir}/*/* +%{_bindir}/* + +%changelog +* Thu Aug 03 2017 Fedora Release Engineering - 008-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 008-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 008-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Aug 29 2016 Peter Robinson 008-6 +- Don't ship usbutils pkgconfig file + +* Fri Feb 05 2016 Fedora Release Engineering - 008-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Jul 19 2015 Peter Robinson 008-4 +- Fix FTBFS, cleanup and modernise spec, use %%license + +* Fri Jun 19 2015 Fedora Release Engineering - 008-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 008-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Wed Oct 22 2014 Lukáš Nykrýn - 008-1 +- new release + +* Mon Aug 18 2014 Fedora Release Engineering - 007-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 007-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 007-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 17 2013 Lukáš Nykrýn - 007-1 +- new upstream release + +* Tue Feb 26 2013 Lukáš Nykrýn - 006-4 +- lsusb-t: make sure that interfaces are added to lists only once (#914929) + +* Fri Feb 15 2013 Fedora Release Engineering - 006-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 006-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Lukáš Nykrýn - 006-1 +- new upstream release + +* Thu Apr 19 2012 Lukas Nykryn 005-1 +- new upstream release + +* Thu Apr 19 2012 Lukas Nykryn 004-4 +- Ignore missing driver symlink (#808934) + +* Sat Jan 14 2012 Fedora Release Engineering - 004-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild