[usbutils] fixed paths to usb.ids

[Lukáš Nykrýn]

commit afcded7a370b3156cc36e8072e9a176e6dab29ff
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              |   11 +++++++----
 2 files changed, 28 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 a367304..d253b50 100644
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 004
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source:	http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
 URL: http://www.linux-usb.org/
 License: GPLv2+
@@ -12,6 +12,8 @@ Summary: Linux USB utilities
 Group: Applications/System
 Conflicts: hotplug < 3:2002_01_14-2
 Patch0: usbutils-003-hwdata.patch
+#Path to usb.ids should be with /hwdata/
+Patch1: usbutils-make-hwdata.patch
 
 %description
 This package contains utilities for inspecting devices connected to a
@@ -20,6 +22,7 @@ USB bus.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 autoreconf
 
 %build
@@ -30,9 +33,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}/*/*
@@ -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
+* Tue Aug 20 2011 Lukas Nykryn <lnykryn at redhat.com> 004-2
+- fixed paths to usb.ids 
+
 * Sat Aug 13 2011 Jiri Moskovcak <jmoskovc at redhat.com> 004-1
 - new upstream release
 - dropepd config descriptor patch, it's included in upstream version