Update to usbutils-015

Resolves: #2150489
2023-01-13 13:36:09 +01:00
4 changed files with 115 additions and 144 deletions
--- a/106
+++ b/106
@ -1,106 +0,0 @@
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 014-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 014-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 11 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 014-1
- Update to 014
- Cleanup spec, licenses now shipped upstream
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 013-1
- Update to 013
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 012-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun May 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> 012-2
- New 012 release
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 010-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jun 08 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-2
- add upstream fixes
-
-* Wed May 16 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-1
- New 010 release
-
-* 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
-
-* 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
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390
+SHA512 (usbutils-015.tar.xz) = cda0070138400703d7429d39dee49130aedaa704292531e6af57b347cc62422ca609540650926e74335f71d67d7d4655418be4824e1eb8a2b065c7b395feaa87
--- a/usbreset.patch
+++ b/usbreset.patch
@ -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)
- 
- 
- ################################
--- a/usbutils.spec
+++ b/usbutils.spec
@ -1,21 +1,15 @@
 Name:    usbutils
-Version: 019
-Release: %autorelease
+Version: 015
+Release: 1%{?dist}
 Summary: Linux USB utilities
 URL:     http://www.linux-usb.org/
-License: GPL-2.0-or-later
+License: GPLv2+

 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
-
-BuildRequires: meson
+BuildRequires: make
 BuildRequires: gcc
-BuildRequires: libusb1-devel
+BuildRequires: libusbx-devel
 BuildRequires: systemd-devel
 Requires: hwdata

@ -27,11 +21,11 @@ USB bus.
 %autosetup -p1

 %build
-%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata
-%meson_build
+%configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids
+%make_build

 %install
-%meson_install
+%make_install
 rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc

 %files
@ -41,4 +35,109 @@ rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
 %{_bindir}/*

 %changelog
-%autochangelog
+* Fri Jan 13 2023 Jan Macku <jamacku@redhat.com> - 015-1
+- Update to 015
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 014-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Aug 11 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 014-1
+- Update to 014
+- Cleanup spec, licenses now shipped upstream
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 013-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 013-1
+- Update to 013
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 012-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 012-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun May 12 2019 Peter Robinson <pbrobinson@fedoraproject.org> 012-2
+- New 012 release
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 010-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jun 08 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-2
+- add upstream fixes
+
+* Wed May 16 2018 Lukas Nykryn <lnykryn@redhat.com> - 010-1
+- New 010 release
+
+* 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
+
+* 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