usbutils: Update to 005.

Basicly this patch removes the usb.ids file from the package
which is provided by hwdata.

diff --git a/usbutils/patches/usbutils-003-hwdata.patch b/usbutils/patches/usbutils-003-hwdata.patch
new file mode 100644 (file)
index 0000000..4a08c48
--- /dev/null
+++ b/usbutils/patches/usbutils-003-hwdata.patch
@@ -0,0 +1,79 @@
+--- 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
+-
+ bin_PROGRAMS = \
+       lsusb
+ 
+-sbin_SCRIPTS = \
+-      update-usbids.sh
+-
+ bin_SCRIPTS = \
+       usb-devices \
+       lsusb.py
+@@ -27,37 +21,22 @@
+ 
+ lsusb_CPPFLAGS = \
+       $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
+-      -DDATADIR=\"$(datadir)\"
++      -DDATADIR=\"$(datadir)/hwdata\"
+ 
+ lsusb_LDADD = \
+       $(LIBUSB_LIBS)
+ 
+-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 \
+       lsusb.8.in \
+       usb-devices.1.in \
+       usb-devices \
+       lsusb.py \
+       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' $< >$@
+ 
+@@ -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:
+--- usbutils-003/lsusb.py      2010-12-16 01:07:09.000000000 +0100
++++ usbutils-003_/lsusb.py     2011-08-11 09:57:57.079327430 +0200
+@@ -16,7 +16,7 @@
+ warnsort = False
+ 
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+ 
+ esc = chr(27)
+ norm = esc + "[0;0m"

diff --git a/usbutils/patches/usbutils-make-hwdata.patch b/usbutils/patches/usbutils-make-hwdata.patch
new file mode 100644 (file)
index 0000000..862c7fc
--- /dev/null
+++ b/usbutils/patches/usbutils-make-hwdata.patch
@@ -0,0 +1,21 @@
+diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am
+--- usbutils-004/Makefile.am.orig      2011-09-20 09:42:04.282566870 +0200
++++ usbutils-004/Makefile.am   2011-09-20 09:42:41.399102845 +0200
+@@ -38,7 +38,7 @@ EXTRA_DIST = \
+       usbutils.pc.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)/hwdata/usb.ids|g' $< >$@
+ 
+ usb-devices.1: $(srcdir)/usb-devices.1.in
+       sed 's|VERSION|$(VERSION)|g' $< >$@
+@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig
+ pkgconfig_DATA = usbutils.pc
+ 
+ usbutils.pc: $(srcdir)/usbutils.pc.in
+-      sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
++      sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
+ 
+ DISTCLEANFILES = \
+       lsusb.8 \

diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index e803744f4838ff9add45030250130537c8b53b70..f9c1df4e6958fe2227984b1a2f732691f516cc99 100644 (file)
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -5,8 +5,8 @@
 
 name       = usbutils
 epoch      = 1
-version    = 003
-release    = 2
+version    = 005
+release    = 1
 
 groups     = System/Tools
 url        = http://www.linux-usb.org/
@@ -21,14 +21,19 @@ source_dl  = http://www.kernel.org/pub/linux/utils/usb/usbutils/
 
 build
        requires
+               autoconf
+               automake
+               hwdata
                libusb-devel
                pkg-config
                zlib-devel
        end
 
-       install_cmds
-               rm -fv %{BUILDROOT}/usr/share/usb.ids.gz
+       prepare_cmds
+               ./autogen.sh
+       end
 
+       install_cmds
                # Removing lsusb.py.
                rm -rfv %{BUILDROOT}/usr/bin/lsusb.py
        end
@@ -41,6 +46,16 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       end
+
+       package %{name}-devel
+               template DEVEL
+
+               requires = %{name}-libs = %{epoch}:%{thisver}
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end