diff --git a/.gitignore b/.gitignore index 674563b..99e65a8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ usbutils-0.86.tar.gz /usbutils-0.90.tar.gz /usbutils-0.91.tar.gz /usbutils-001.tar.gz +/usbutils-003.tar.gz diff --git a/sources b/sources index 80257ac..55fdbcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05610d15c3c8c8ada3d691c320ca784a usbutils-002.tar.gz +94a1738fe92062cdd6a9642eeaccefc1 usbutils-003.tar.gz diff --git a/usbutils-002-hwdata.patch b/usbutils-003-hwdata.patch similarity index 77% rename from usbutils-002-hwdata.patch rename to usbutils-003-hwdata.patch index 3551d7f..c755983 100644 --- a/usbutils-002-hwdata.patch +++ b/usbutils-003-hwdata.patch @@ -1,36 +1,41 @@ ---- usbutils-002/Makefile.am 2011-01-13 00:09:34.000000000 +0100 -+++ usbutils-002_/Makefile.am 2011-04-26 18:45:03.247443437 +0200 -@@ -4,18 +4,9 @@ +--- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100 ++++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200 +@@ -4,15 +4,9 @@ AM_LDFLAGS = \ -Wl,--as-needed - + -data_DATA = \ - usb.ids --if HAVE_ZLIB --data_DATA += usb.ids.gz --endif - bin_PROGRAMS = \ lsusb - + -sbin_SCRIPTS = \ - update-usbids.sh - bin_SCRIPTS = \ usb-devices \ lsusb.py -@@ -30,7 +21,7 @@ - +@@ -27,37 +21,22 @@ + lsusb_CPPFLAGS = \ $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \ - -DDATADIR=\"$(datadir)\" + -DDATADIR=\"$(datadir)/hwdata\" - + lsusb_LDADD = \ $(LIBUSB_LIBS) -@@ -40,21 +31,12 @@ + +-if HAVE_ZLIB +-data_DATA += usb.ids.gz +-lsusb_CPPFLAGS += -DHAVE_LIBZ +-lsusb_LDADD += -lz +-endif +- + man_MANS = \ + lsusb.8 \ usb-devices.1 - + EXTRA_DIST = \ - usb.ids \ - update-usbids.sh.in \ @@ -39,7 +44,7 @@ usb-devices \ lsusb.py \ usbutils.pc.in - + -usb.ids.gz: $(srcdir)/usb.ids - gzip -c -9 $< > $@ - @@ -49,15 +54,15 @@ - lsusb.8: $(srcdir)/lsusb.8.in sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ - -@@ -68,10 +50,8 @@ + +@@ -71,10 +50,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: diff --git a/usbutils.spec b/usbutils.spec index 5cc27ea..5e6f066 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,5 +1,5 @@ Name: usbutils -Version: 002 +Version: 003 Release: 1%{?dist} Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz URL: http://www.linux-usb.org/ @@ -11,7 +11,7 @@ BuildRequires: autoconf, libtool, libusb-devel >= 0.1.8, libusb1-devel Summary: Linux USB utilities Group: Applications/System Conflicts: hotplug < 3:2002_01_14-2 -Patch0: usbutils-002-hwdata.patch +Patch0: usbutils-003-hwdata.patch %description This package contains utilities for inspecting devices connected to a @@ -44,6 +44,9 @@ sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUIL rm -rf $RPM_BUILD_ROOT %changelog +* 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