diff --git a/.gitignore b/.gitignore index 5b8e587..b930f22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,11 @@ -/usbutils-*.tar.xz +usbutils-0.86.tar.gz +/usbutils-0.90.tar.gz +/usbutils-0.91.tar.gz +/usbutils-001.tar.gz +/usbutils-003.tar.gz +/usbutils-004.tar.gz +/usbutils-005.tar.gz +/usbutils-006.tar.gz +/usbutils-007.tar.gz +/usbutils-008.tar.gz +/usbutils-008.tar.xz diff --git a/changelog b/changelog deleted file mode 100644 index 7740917..0000000 --- a/changelog +++ /dev/null @@ -1,106 +0,0 @@ -* Sat Jul 23 2022 Fedora Release Engineering - 014-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 014-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Aug 11 2021 Peter Robinson - 014-1 -- Update to 014 -- Cleanup spec, licenses now shipped upstream - -* Fri Jul 23 2021 Fedora Release Engineering - 013-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 013-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 29 2020 Peter Robinson - 013-1 -- Update to 013 - -* Wed Jul 29 2020 Fedora Release Engineering - 012-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 012-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 012-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun May 12 2019 Peter Robinson 012-2 -- New 012 release - -* Sun Feb 03 2019 Fedora Release Engineering - 010-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jun 08 2018 Lukas Nykryn - 010-2 -- add upstream fixes - -* Wed May 16 2018 Lukas Nykryn - 010-1 -- New 010 release - -* Fri Feb 09 2018 Fedora Release Engineering - 009-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 4 2017 Peter Robinson 009-1 -- New 009 release - -* 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 diff --git a/sources b/sources index 8550f5f..5d8ce25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390 +2780b6ae21264c888f8f30fb2aab1259 usbutils-008.tar.xz diff --git a/usbreset.patch b/usbreset.patch deleted file mode 100644 index 15a2f80..0000000 --- a/usbreset.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/meson.build b/meson.build -index c522283..f6bd530 100644 ---- a/meson.build -+++ b/meson.build -@@ -76,7 +76,7 @@ add_project_arguments('-include', 'config.h', language : 'c') - ##################### - # man page generation - ##################### --install_man(['man/lsusb.8', 'man/lsusb.py.1', 'man/usb-devices.1', 'man/usbhid-dump.8']) -+install_man(['man/lsusb.8', 'man/lsusb.py.1', 'man/usb-devices.1', 'man/usbhid-dump.8', 'man/usbreset.1']) - - - ########################## -@@ -137,7 +137,7 @@ usbreset_sources = [ - - # By default, usbreset does not get installed as it could cause problems, it's - # in the repo for those that wish to try it out. --executable('usbreset', usbreset_sources, install: false) -+executable('usbreset', usbreset_sources, install: true) - - - ################################ 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 index 8be5e9d..0e7939e 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,21 +1,17 @@ Name: usbutils -Version: 019 -Release: %autorelease Summary: Linux USB utilities +Version: 008 +Release: 6%{?dist} URL: http://www.linux-usb.org/ -License: GPL-2.0-or-later +License: GPLv2+ +Group: Applications/System Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz -# This adds usbreset binary to the package, but since upstream does not consider it stable, -# let's not include it in the ELN. https://github.com/gregkh/usbutils/issues/222#issuecomment-2715192013 -%if 0%{?fedora} -Patch0: usbreset.patch -%endif +#Path to usb.ids in lsusb.py should be with /hwdata/ +Patch0: usbutils-006-hwdata.patch -BuildRequires: meson -BuildRequires: gcc -BuildRequires: libusb1-devel +BuildRequires: libusbx-devel BuildRequires: systemd-devel Requires: hwdata @@ -24,21 +20,73 @@ This package contains utilities for inspecting devices connected to a USB bus. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 %build -%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata -%meson_build +%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids +make %{?_smp_mflags} %install -%meson_install -rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm -rf %{buildroot}/%{_datadir}/pkgconfig/usbutils.pc %files -%license LICENSES/GPL* -%doc NEWS +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS NEWS README %{_mandir}/*/* %{_bindir}/* %changelog -%autochangelog +* 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