Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1 @@
-usbutils-0.86.tar.gz
-/usbutils-0.90.tar.gz
+/usbutils-*.tar.xz

changelog

@@ -0,0 +1,106 @@
+* 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

sources

@@ -1 +1 @@
-53f0269e2cba704d5a35dfe291511292  usbutils-0.90.tar.gz
+SHA512 (usbutils-019.tar.xz) = fb4acc570c2b71f90c51c2717dc80e844727c8fcfebb5d92c57145eb9d09cbd1f63cf405e07db76c3afaaf3fac87b90f3f512d0a7c4d50cb9e6f26438eca9390

usbreset.patch

@@ -0,0 +1,22 @@
+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)
+ 
+ 
+ ################################

usbutils-0.86-hwdata.patch

@@ -1,62 +0,0 @@
---- usbutils-0.86/Makefile.am_old	2009-09-16 11:56:26.000000000 +0200
-+++ usbutils-0.86/Makefile.am	2009-09-16 11:57:40.000000000 +0200
-@@ -1,18 +1,9 @@
- AM_LDFLAGS = \
- 	-Wl,--as-needed
- 
--data_DATA = \
--	usb.ids
--if HAVE_ZLIB
--data_DATA += usb.ids.gz
--endif
--
- sbin_PROGRAMS = \
- 	lsusb
- 
--sbin_SCRIPTS = \
--	update-usbids.sh
--
- bin_SCRIPTS = \
- 	usb-devices
- 
-@@ -26,7 +17,7 @@
- 
- lsusb_CPPFLAGS = \
- 	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
--	-DDATADIR=\"$(datadir)\"
-+	-DDATADIR=\"$(datadir)/hwdata\"
- 
- lsusb_LDADD = \
- 	$(LIBUSB_LIBS)
-@@ -36,20 +27,11 @@
- 	usb-devices.1
- 
- EXTRA_DIST = \
--	usb.ids \
--	update-usbids.sh.in \
- 	lsusb.8.in \
- 	usb-devices.1.in \
- 	usb-devices \
- 	usbutils.pc.in
- 
--usb.ids.gz: $(srcdir)/usb.ids
--	gzip -c -9 $< > $@
--
--update-usbids.sh: $(srcdir)/update-usbids.sh.in
--	sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
--	chmod 755 $@
--
- lsusb.8: $(srcdir)/lsusb.8.in
- 	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
- 
-@@ -63,10 +45,8 @@
- 	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
- 
- DISTCLEANFILES = \
--	usb.ids.gz \
- 	lsusb.8 \
- 	usb-devices.1 \
--	update-usbids.sh \
- 	usbutils.pc
- 
- distclean-local:

usbutils.spec

@@ -1,174 +1,44 @@
-Name: usbutils
-Version: 0.90
-Release: 1%{?dist}
-Source:	http://downloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
-URL: http://www.linux-usb.org/
-License: GPLv2+
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: hwdata
-BuildRequires: autoconf, libtool, libusb-devel >= 0.1.8
+Name:    usbutils
+Version: 019
+Release: %autorelease
 Summary: Linux USB utilities
-Group: Applications/System
-Conflicts: hotplug < 3:2002_01_14-2
-Patch0: usbutils-0.86-hwdata.patch
+URL:     http://www.linux-usb.org/
+License: GPL-2.0-or-later
+
+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: gcc
+BuildRequires: libusb1-devel
+BuildRequires: systemd-devel
+Requires: hwdata
 
 %description
 This package contains utilities for inspecting devices connected to a
 USB bus.
 
 %prep
-%setup -q
-%patch0 -p1
-autoreconf
+%autosetup -p1
 
 %build
-%configure --sbindir=%{_sbindir}
-make %{?_smp_mflags}
+%meson --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata
+%meson_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-
-# usb.ids is shipped in hwdata; nuke and adjust .pc file
-sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/usbutils.pc
+%meson_install
+rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
 
 %files
-%defattr(-,root,root,-)
+%license LICENSES/GPL*
+%doc NEWS
 %{_mandir}/*/*
-%{_sbindir}/*
 %{_bindir}/*
-%{_datadir}/pkgconfig/usbutils.pc
-%doc AUTHORS COPYING ChangeLog NEWS README
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Aug 26 2010 Jiri Moskovcak <jmoskovc@redhat.com> 0.90-1
-- new upstream release
-
-* Tue Sep 22 2009  Jiri Moskovcak <jmoskovc@redhat.com> 0.86-2
-- spec file fixes - package should not own /usr/{bin,sbin} (rhbz#524005)
-
-* Wed Sep 16 2009  Jiri Moskovcak <jmoskovc@redhat.com> 0.86-1
-- new version
-- spec file fixes as suggested in rhbz#466041 (info@owlriver.com)
-
-* Mon Aug 24 2009 Karsten Hopp <karsten@redhat.com> 0.82-5
-- drop ExcludeArch: s390 s390x as we need this package on s390x to be able to build
-  p.e. udev without any hacks
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.82-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul  1 2009  Jiri Moskovcak <jmoskovc@rdhat.com> 0.82-3
-- added autoconf to fix build in koji
-
-* Wed Jul  1 2009  Jiri Moskovcak <jmoskovc@redhat.com> 0.82-2
-- minor fix in Makefile.am to properly find usb.ids from hwdata
-- Resolves: #506974
-
-* Fri May 22 2009 David Zeuthen <davidz@redhat.com> 0.82-1
-- Update to 0.82
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.73-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 12 2008 Jiri Moskovcak <jmoskovc@redhat.com> 0.73-2
-- spec file cleanup
-
-* Thu Jan 17 2008 Jiri Moskovcak <jmoskovc@redhat.com> 0.73-1
-- new version 0.73
-
-* Mon Sep 18 2006 Thomas Woerner <twoerner@redhat.com> 0.72-1
-- new version 0.72
-- videoterminal (vt) patch is now upstream, dropped
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.71-2.1
-- rebuild
-
-* Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 1.71-2
-- add usbutils-0.71-VT.patch to fix warnings about unknown lines
-  (#176903)
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.71-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.71-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Dec 13 2005 Thomas Woerner <twoerner@redhat.com> 0.71-1
-- new version 0.71
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Fri Apr 15 2005 Thomas Woerner <twoerner@redhat.com> 0.70-1.1
-- added fix from Robert Scheck to fix missing BuildRequires for libusb-devel
- (#155006)
-
-* Thu Apr 14 2005 Thomas Woerner <twoerner@redhat.com> 0.70-1
-- new version 0.70
-
-* Thu Jan 20 2005 David Woodhouse <dwmw2@redhat.com> 0.11-6.2
-- Don't byteswap parts of device descriptor which kernel already swapped
-
-* Mon Sep 13 2004 Thomas Woerner <twoerner@redhat.com> 0.11-6.1
-- added missing BuildRequires for libtool (#132406)
-
-* Wed Sep  1 2004 Thomas Woerner <twoerner@redhat.com> 0.11-6
-- added patch from Aurelien Jarno for unknown HID Country Code entries in
-  usb.ids (#127415)
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue May  4 2004 Bill Nottingham <notting@redhat.com> 0.11-4
-- add patch from USB maintainer to fix various brokenness (#115694, <david-b@pacbell.net>)
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
-- add explicit epoch's where needed.
-
-* Mon May 19 2003 Bill Nottingham <notting@redhat.com> 0.11-1
-- update to 0.11, fixes #90640
-- add patch to fix some warnings (#78462, <d.binderman@virgin.net>)
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Fri Nov 29 2002 Tim Powers <timp@redhat.com> 0.9-9
-- remove unpackaged files from the buildroot
-
-* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- exclude mainframe
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Thu Mar 21 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-5
-- Fix conflict check
-
-* Mon Mar 18 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-4
-- Conflict with older versions of hotplug which contained
-  parts of this package (#60615)
-
-* Fri Feb 22 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-3
-- Rebuild
-
-* Wed Jan 30 2002 Bill Nottingham <notting@redhat.com> 0.9-2
-- require hwdata
-
-* Wed Jan 16 2002 Trond Eivind Glomsrød <teg@redhat.com> 0.9-1
-- Initial RPM
-- make it build on ia64
-
+%autochangelog