diff --git a/usbutils-0.70-hwdata.patch b/usbutils-0.70-hwdata.patch new file mode 100644 index 0000000..fb97525 --- /dev/null +++ b/usbutils-0.70-hwdata.patch @@ -0,0 +1,21 @@ +--- 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 + diff --git a/usbutils.spec b/usbutils.spec index dbc71c1..8911516 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -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 @@ USB bus. %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 -f $RPM_BUILD_ROOT%{_datadir}/usb.ids rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 14 2005 Thomas Woerner 0.70-1 +- new version 0.70 + * Thu Jan 20 2005 David Woodhouse 0.11-6.2 - Don't byteswap parts of device descriptor which kernel already swapped