This commit is contained in:
Troy Dawson 2017-09-25 13:17:17 +00:00
parent 190e13361f
commit 19fb52973c
5 changed files with 137 additions and 0 deletions

1
.gitignore vendored
View File

@ -0,0 +1 @@
/usbutils-008.tar.xz

1
sources Normal file
View File

@ -0,0 +1 @@
2780b6ae21264c888f8f30fb2aab1259 usbutils-008.tar.xz

13
usbutils-006-hwdata.patch Normal file
View File

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

View File

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

101
usbutils.spec Normal file
View File

@ -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 <releng@fedoraproject.org> - 008-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 008-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Aug 29 2016 Peter Robinson <pbrobinson@fedoraproject.org> 008-6
- Don't ship usbutils pkgconfig file
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 008-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 008-4
- Fix FTBFS, cleanup and modernise spec, use %%license
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 008-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 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 <lnykryn@redhat.com> - 008-1
- new release
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 007-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 17 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 007-1
- new upstream release
* Tue Feb 26 2013 Lukáš Nykrýn <lnykryn@redhat.com> - 006-4
- lsusb-t: make sure that interfaces are added to lists only once (#914929)
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 006-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jul 16 2012 Lukáš Nykrýn <lnykryn@redhat.com> - 006-1
- new upstream release
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 005-1
- new upstream release
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 004-4
- Ignore missing driver symlink (#808934)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 004-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild