[usbutils/f15] fixed paths to usb.ids

[Lukáš Nykrýn]

commit 795d1eaf61983fdcc500c89e766db6f6b27bc1d6
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Sep 20 10:23:41 2011 +0200

    fixed paths to usb.ids

 usbutils-make-hwdata.patch |   21 +++++++++++++++++++++
 usbutils.spec              |   13 +++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/usbutils-make-hwdata.patch b/usbutils-make-hwdata.patch
new file mode 100644
index 0000000..862c7fc
--- /dev/null
+++ b/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.spec b/usbutils.spec
index 082fc58..814b882 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 003
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source:	http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -17,6 +17,9 @@ Patch0: usbutils-003-hwdata.patch
 # signal 11 (SIGSEGV)"
 # sent to upstream (Greg KH) via email and github pull request
 Patch1: usbutils-003-invalid-config-descriptors.patch
+#Path to usb.ids should be with /hwdata/
+Patch2: usbutils-make-hwdata.patch
+
 
 %description
 This package contains utilities for inspecting devices connected to a
@@ -26,6 +29,8 @@ USB bus.
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .invalid-config-descriptors
+%patch2 -p1
+
 autoreconf
 
 %build
@@ -36,9 +41,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-# usb.ids is shipped in hwdata; nuke and adjust .pc file
-sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUILD_ROOT%{_datadir}/pkgconfig/usbutils.pc
-
 %files
 %defattr(-,root,root,-)
 %{_mandir}/*/*
@@ -50,6 +52,9 @@ sed -i 's|usbids=/usr/share/usb.ids|usbids=/usr/share/hwdata/usb.ids|' $RPM_BUIL
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 20 2011 Lukas Nykryn <lnykryn at redhat.com> 003-4
+- fixed paths to usb.ids 
+
 * Thu Aug 11 2011 Jiri Moskovcak <jmoskovc at redhat.com> 003-3
 - fixed path to usb.ids in lsusb.py rhbz#729903