rpms/usbutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update to usbutils-002

Browse Source
This commit is contained in:
Jiri Moskovcak 2011-04-26 18:53:37 +02:00
parent 25d49a1c75
commit b55d1689c3
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
3ecdcb42f08ef0d63e2638feb06ececc usbutils-001.tar.gz 05610d15c3c8c8ada3d691c320ca784a usbutils-002.tar.gz

33
usbutils-001-hwdata.patch → usbutils-002-hwdata.patch
View File

@ -1,9 +1,9 @@
--- usbutils-001/Makefile.am 2010-11-16 23:12:53.000000000 +0100 --- usbutils-002/Makefile.am 2011-01-13 00:09:34.000000000 +0100
+++ usbutils-001_hwdata/Makefile.am 2011-01-06 12:23:30.785190968 +0100 +++ usbutils-002_/Makefile.am 2011-04-26 18:45:03.247443437 +0200
@@ -4,18 +4,9 @@ @@ -4,18 +4,9 @@
AM_LDFLAGS = \ AM_LDFLAGS = \
-Wl,--as-needed -Wl,--as-needed
-data_DATA = \ -data_DATA = \
- usb.ids - usb.ids
-if HAVE_ZLIB -if HAVE_ZLIB
@ -12,33 +12,34 @@
- -
bin_PROGRAMS = \ bin_PROGRAMS = \
lsusb lsusb
-sbin_SCRIPTS = \ -sbin_SCRIPTS = \
- update-usbids.sh - update-usbids.sh
- -
bin_SCRIPTS = \ bin_SCRIPTS = \
usb-devices usb-devices \
lsusb.py
@@ -29,7 +20,7 @@ @@ -30,7 +21,7 @@
lsusb_CPPFLAGS = \ lsusb_CPPFLAGS = \
$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \ $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
- -DDATADIR=\"$(datadir)\" - -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\" + -DDATADIR=\"$(datadir)/hwdata\"
lsusb_LDADD = \ lsusb_LDADD = \
$(LIBUSB_LIBS) $(LIBUSB_LIBS)
@@ -39,20 +30,11 @@ @@ -40,21 +31,12 @@
usb-devices.1 usb-devices.1
EXTRA_DIST = \ EXTRA_DIST = \
- usb.ids \ - usb.ids \
- update-usbids.sh.in \ - update-usbids.sh.in \
lsusb.8.in \ lsusb.8.in \
usb-devices.1.in \ usb-devices.1.in \
usb-devices \ usb-devices \
lsusb.py \
usbutils.pc.in usbutils.pc.in
-usb.ids.gz: $(srcdir)/usb.ids -usb.ids.gz: $(srcdir)/usb.ids
- gzip -c -9 $< > $@ - gzip -c -9 $< > $@
- -
@ -48,15 +49,15 @@
- -
lsusb.8: $(srcdir)/lsusb.8.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)/usb.ids|g' $< >$@
@@ -66,10 +48,8 @@ @@ -68,10 +50,8 @@
sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
DISTCLEANFILES = \ DISTCLEANFILES = \
- usb.ids.gz \ - usb.ids.gz \
lsusb.8 \ lsusb.8 \
usb-devices.1 \ usb-devices.1 \
- update-usbids.sh \ - update-usbids.sh \
usbutils.pc usbutils.pc
distclean-local: distclean-local:

10
usbutils.spec
View File

@ -1,6 +1,6 @@
Name: usbutils Name: usbutils
Version: 001 Version: 002
Release: 3%{?dist} Release: 1%{?dist}
Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
URL: http://www.linux-usb.org/ URL: http://www.linux-usb.org/
License: GPLv2+ License: GPLv2+
@ -11,7 +11,7 @@ BuildRequires: autoconf, libtool, libusb-devel >= 0.1.8, libusb1-devel
Summary: Linux USB utilities Summary: Linux USB utilities
Group: Applications/System Group: Applications/System
Conflicts: hotplug < 3:2002_01_14-2 Conflicts: hotplug < 3:2002_01_14-2
Patch0: usbutils-001-hwdata.patch Patch0: usbutils-002-hwdata.patch
%description %description
This package contains utilities for inspecting devices connected to a This package contains utilities for inspecting devices connected to a
@ -44,6 +44,10 @@ sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUIL
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Apr 26 2011 Jiri Moskovcak <jmoskovc@redhat.com> 002-1
- new upstream release
- udpated hwdata patch
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 001-3 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 001-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild