rpms/usbutils/devel usbutils-0.70-hwdata.patch, NONE, 1.1 usbutils.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/usbutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24412

Modified Files:
	usbutils.spec 
Added Files:
	usbutils-0.70-hwdata.patch 
Log Message:
[tw] - new version 0.70 with major code cleanups


usbutils-0.70-hwdata.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE usbutils-0.70-hwdata.patch ---
--- usbutils-0.70/Makefile.in.hwdata	2005-04-14 18:12:45.000000000 +0200
+++ usbutils-0.70/Makefile.in	2005-04-14 18:12:59.000000000 +0200
@@ -180,7 +180,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CPPFLAGS = -DUSBIDS_FILE='"@datadir@/usb.ids"'
+AM_CPPFLAGS = -DUSBIDS_FILE='"@datadir@/hwdata/usb.ids"'
 AM_CFLAGS = -Wall -W -Wunused
 lsusb_SOURCES = lsusb.c \
 	names.c names.h \
--- usbutils-0.70/Makefile.am.hwdata	2005-04-14 18:12:22.000000000 +0200
+++ usbutils-0.70/Makefile.am	2005-04-14 18:13:14.000000000 +0200
@@ -1,6 +1,6 @@
 # Process this file with 'automake' to create 'Makefile.in'
 
-AM_CPPFLAGS = -DUSBIDS_FILE='"@datadir@/usb.ids"'
+AM_CPPFLAGS = -DUSBIDS_FILE='"@datadir@/hwdata/usb.ids"'
 
 AM_CFLAGS = -Wall -W -Wunused
 


Index: usbutils.spec
===================================================================
RCS file: /cvs/dist/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- usbutils.spec	21 Jan 2005 18:38:19 -0000	1.12
+++ usbutils.spec	14 Apr 2005 16:23:11 -0000	1.13
@@ -1,11 +1,9 @@
 Name: usbutils
-Version: 0.11
-Release: 6.2
-Source:	 http://usb.cs.tum.edu/download/%{name}-%{version}.tar.gz
-Patch: usbutils-0.9-hwdata.patch
-Patch2: usbutils-0214.patch
-Patch3: usbutils-0.11-hidcc.patch
-Patch4: usbutils-0.11-endian.patch
+Version: 0.70
+Release: 1
+Source:	http://prdownloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
+Patch1: usbutils-0.70-hwdata.patch
+URL: http://www.linux-usb.org/
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: hwdata
@@ -21,10 +19,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .hwdata
-%patch2 -p1 -b .0214
-%patch3 -p1 -b .hidcc
-%patch4 -p1 -b .endian
+%patch1 -p1 -b .hwdata
 
 %build
 cp /usr/share/libtool/config.{sub,guess} .
@@ -52,6 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 14 2005 Thomas Woerner <twoerner at redhat.com> 0.70-1
+- new version 0.70
+
 * Thu Jan 20 2005 David Woodhouse <dwmw2 at redhat.com> 0.11-6.2
 - Don't byteswap parts of device descriptor which kernel already swapped