[usbutils] update to usbutils-002
Jiří Moskovčák
jmoskovc at fedoraproject.org
Tue Apr 26 16:57:58 UTC 2011
commit 9d88b84e83ca6e9d8c9fb5a6010dc835c7df65d4
Author: Jiri Moskovcak <jmoskovc at redhat.com>
Date: Tue Apr 26 18:53:37 2011 +0200
update to usbutils-002
sources | 2 +-
...s-001-hwdata.patch => usbutils-002-hwdata.patch | 33 ++++++++++---------
usbutils.spec | 10 ++++--
3 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/sources b/sources
index 0dfb7f5..80257ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ecdcb42f08ef0d63e2638feb06ececc usbutils-001.tar.gz
+05610d15c3c8c8ada3d691c320ca784a usbutils-002.tar.gz
diff --git a/usbutils-001-hwdata.patch b/usbutils-002-hwdata.patch
similarity index 80%
rename from usbutils-001-hwdata.patch
rename to usbutils-002-hwdata.patch
index 7e67072..3551d7f 100644
--- a/usbutils-001-hwdata.patch
+++ b/usbutils-002-hwdata.patch
@@ -1,9 +1,9 @@
---- usbutils-001/Makefile.am 2010-11-16 23:12:53.000000000 +0100
-+++ usbutils-001_hwdata/Makefile.am 2011-01-06 12:23:30.785190968 +0100
+--- 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 @@
AM_LDFLAGS = \
-Wl,--as-needed
-
+
-data_DATA = \
- usb.ids
-if HAVE_ZLIB
@@ -12,33 +12,34 @@
-
bin_PROGRAMS = \
lsusb
-
+
-sbin_SCRIPTS = \
- update-usbids.sh
-
bin_SCRIPTS = \
- usb-devices
-
-@@ -29,7 +20,7 @@
-
+ usb-devices \
+ lsusb.py
+@@ -30,7 +21,7 @@
+
lsusb_CPPFLAGS = \
$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)/hwdata\"
-
+
lsusb_LDADD = \
$(LIBUSB_LIBS)
-@@ -39,20 +30,11 @@
+@@ -40,21 +31,12 @@
usb-devices.1
-
+
EXTRA_DIST = \
- usb.ids \
- update-usbids.sh.in \
lsusb.8.in \
usb-devices.1.in \
usb-devices \
+ lsusb.py \
usbutils.pc.in
-
+
-usb.ids.gz: $(srcdir)/usb.ids
- gzip -c -9 $< > $@
-
@@ -48,15 +49,15 @@
-
lsusb.8: $(srcdir)/lsusb.8.in
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' $< >$@
-
+
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 0879f18..5cc27ea 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,6 +1,6 @@
Name: usbutils
-Version: 001
-Release: 3%{?dist}
+Version: 002
+Release: 1%{?dist}
Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
URL: http://www.linux-usb.org/
License: GPLv2+
@@ -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-001-hwdata.patch
+Patch0: usbutils-002-hwdata.patch
%description
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
%changelog
+* Tue Apr 26 2011 Jiri Moskovcak <jmoskovc at redhat.com> 002-1
+- new upstream release
+- udpated hwdata patch
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 001-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list