From ef3b1fb1cd3161e294183153eb30880858f83413 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 19 Jul 2015 12:42:35 +0100 Subject: [PATCH] Fix FTBFS, cleanup and modernise spec, use %%license --- .gitignore | 1 + sources | 2 +- usbutils.spec | 213 +++++--------------------------------------------- 3 files changed, 20 insertions(+), 196 deletions(-) diff --git a/.gitignore b/.gitignore index 34a005c..b930f22 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ usbutils-0.86.tar.gz /usbutils-006.tar.gz /usbutils-007.tar.gz /usbutils-008.tar.gz +/usbutils-008.tar.xz diff --git a/sources b/sources index 385650b..5d8ce25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb20148c2e784577e924a7b4c560c8fb usbutils-008.tar.gz +2780b6ae21264c888f8f30fb2aab1259 usbutils-008.tar.xz diff --git a/usbutils.spec b/usbutils.spec index 468722e..aa39a2b 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,20 +1,20 @@ -Name: usbutils -Version: 008 -Release: 3%{?dist} -Source: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{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, libusb1-devel, systemd-devel +Name: usbutils Summary: Linux USB utilities -Group: Applications/System -Conflicts: hotplug < 3:2002_01_14-2 +Version: 008 +Release: 4%{?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. @@ -28,20 +28,21 @@ USB bus. make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %files -%defattr(-,root,root,-) +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS NEWS README %{_mandir}/*/* %{_bindir}/* %{_datadir}/pkgconfig/usbutils.pc -%doc AUTHORS COPYING ChangeLog NEWS README -%clean -rm -rf $RPM_BUILD_ROOT %changelog +* 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 @@ -84,181 +85,3 @@ rm -rf $RPM_BUILD_ROOT * Sat Jan 14 2012 Fedora Release Engineering - 004-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Aug 20 2011 Lukas Nykryn 004-2 -- fixed paths to usb.ids - -* Sat Aug 13 2011 Jiri Moskovcak 004-1 -- new upstream release -- dropepd config descriptor patch, it's included in upstream version - -* Thu Aug 11 2011 Jiri Moskovcak 003-3 -- fixed path to usb.ids in lsusb.py rhbz#729903 - -* Mon Jun 27 2011 Nils Philippsen 003-2 -- don't use invalid config descriptors (#707853) - -* Thu Jun 16 2011 Jiri Moskovcak 003-1 -- new upstream release - -* Tue Apr 26 2011 Jiri Moskovcak 002-1 -- new upstream release -- udpated hwdata patch - -* Mon Feb 07 2011 Fedora Release Engineering - 001-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 27 2011 Jiri Moskovcak 001-2 -- rebuild against new libusb - -* Thu Jan 06 2011 Jiri Moskovcak 001-1 -- new upstream release -- updated usbhid-dump subproject -- usbutils: Support UVC frame-based descriptors -- usbutils: Support UVC MPEG2-TS format descriptor -- lsusb: Fix getting BOS and DEVQUAL descriptors -- lsusb: Dump the Pipe Usage desciptor -- lsusb: Fix bMaxBurst reporting -- lsusb: install into /usr/bin -- usbmisc: pull in unistd.h for readlink() -- lsusb: pull in stdlib.h for exit() -- lsusb: constify! -- usbutils: convert to libusb-1.0 -- Update usbhid-dump to release 1.2 -- usbutils: Fix compile error on Ubuntu 9.04 -- usbutils: Make lsusb -t show USB 3.0 devices - -* Wed Oct 27 2010 Jiri Moskovcak 0.91-2 -- bump release - -* Wed Oct 27 2010 Jiri Moskovcak 0.91-1 -- new upstream release - - ads usbhid-dump - -* Thu Aug 26 2010 Jiri Moskovcak 0.90-1 -- new upstream release - -* Tue Sep 22 2009 Jiri Moskovcak 0.86-2 -- spec file fixes - package should not own /usr/{bin,sbin} (rhbz#524005) - -* Wed Sep 16 2009 Jiri Moskovcak 0.86-1 -- new version -- spec file fixes as suggested in rhbz#466041 (info@owlriver.com) - -* Mon Aug 24 2009 Karsten Hopp 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 - 0.82-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 1 2009 Jiri Moskovcak 0.82-3 -- added autoconf to fix build in koji - -* Wed Jul 1 2009 Jiri Moskovcak 0.82-2 -- minor fix in Makefile.am to properly find usb.ids from hwdata -- Resolves: #506974 - -* Fri May 22 2009 David Zeuthen 0.82-1 -- Update to 0.82 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.73-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 12 2008 Jiri Moskovcak 0.73-2 -- spec file cleanup - -* Thu Jan 17 2008 Jiri Moskovcak 0.73-1 -- new version 0.73 - -* Mon Sep 18 2006 Thomas Woerner 0.72-1 -- new version 0.72 -- videoterminal (vt) patch is now upstream, dropped - -* Wed Jul 12 2006 Jesse Keating - 0.71-2.1 -- rebuild - -* Wed Mar 01 2006 Karsten Hopp 1.71-2 -- add usbutils-0.71-VT.patch to fix warnings about unknown lines - (#176903) - -* Fri Feb 10 2006 Jesse Keating - 0.71-1.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 0.71-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Dec 13 2005 Thomas Woerner 0.71-1 -- new version 0.71 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Apr 15 2005 Thomas Woerner 0.70-1.1 -- added fix from Robert Scheck to fix missing BuildRequires for libusb-devel - (#155006) - -* Thu Apr 14 2005 Thomas Woerner 0.70-1 -- new version 0.70 - -* Thu Jan 20 2005 David Woodhouse 0.11-6.2 -- Don't byteswap parts of device descriptor which kernel already swapped - -* Mon Sep 13 2004 Thomas Woerner 0.11-6.1 -- added missing BuildRequires for libtool (#132406) - -* Wed Sep 1 2004 Thomas Woerner 0.11-6 -- added patch from Aurelien Jarno for unknown HID Country Code entries in - usb.ids (#127415) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue May 4 2004 Bill Nottingham 0.11-4 -- add patch from USB maintainer to fix various brokenness (#115694, ) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Tue Jun 3 2003 Jeff Johnson -- add explicit epoch's where needed. - -* Mon May 19 2003 Bill Nottingham 0.11-1 -- update to 0.11, fixes #90640 -- add patch to fix some warnings (#78462, ) - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Fri Nov 29 2002 Tim Powers 0.9-9 -- remove unpackaged files from the buildroot - -* Wed Nov 20 2002 Florian La Roche -- exclude mainframe - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Thu Mar 21 2002 Trond Eivind Glomsrød 0.9-5 -- Fix conflict check - -* Mon Mar 18 2002 Trond Eivind Glomsrød 0.9-4 -- Conflict with older versions of hotplug which contained - parts of this package (#60615) - -* Fri Feb 22 2002 Trond Eivind Glomsrød 0.9-3 -- Rebuild - -* Wed Jan 30 2002 Bill Nottingham 0.9-2 -- require hwdata - -* Wed Jan 16 2002 Trond Eivind Glomsrød 0.9-1 -- Initial RPM -- make it build on ia64 -