- better solution (automake --force breaks things)

- call libtoolize in proper dir
- ids patch - fix for 2 bad entries in usb.ids, added eGalax TouchKit ids
- release 2

Changed files:
    usbutils-ids.patch -> 1.1
    usbutils.spec -> 1.15

diff --git a/usbutils-ids.patch b/usbutils-ids.patch
new file mode 100644 (file)
index 0000000..677694c
--- /dev/null
+++ b/usbutils-ids.patch
@@ -0,0 +1,49 @@
+--- usbutils-0.11/usb.ids.orig Mon Jun 17 11:25:14 2002
++++ usbutils-0.11/usb.ids      Thu Dec 26 00:19:16 2002
+@@ -16,6 +16,8 @@
+ 
+ 0000  Virtual
+       0000  Hub
++0123  eGalax ???
++      0001  eGalax TouchKit
+ 0386  LTS
+       0001  PSX for USB Converter
+ 03e8  AOX Inc.
+@@ -1806,7 +1808,7 @@
+ 0c70  MCT Elektronikladen
+       0000  USB08 Development board
+ 0c76  JMTek, LLC.
+-        0003  USBdisk
++      0003  USBdisk
+       0005  USBdisk
+ 0bda  RealTek Semiconductor Corp.
+       8150  RTL8150 Fast Ethernet Adapter
+@@ -1841,6 +1843,9 @@
+ 0e66  Hawking
+       400c  UF100 Ethernet [pegasus2]
+ 0e75  TVS Electronics, Ltd.
++0eef  eGalax
++      0001  eGalax TouchKit
++      0002  eGalax TouchKit
+ 0ef7  Tulip Computers International
+ 1046  Winbond Electronics Corp. [hex]
+       9967  W9967CF/W9968CF WebCam IC
+@@ -1931,6 +1936,9 @@
+       0001  TrackerPod Camera Stand
+ 3504  Micro Star
+       f110  Security Key
++3823  eGalax ???
++      0001  eGalax TouchKit
++      0002  eGalax TouchKit
+ 4242  USB Design by Example
+       4201  Buttons and Lights HID device
+       4220  Echo 1 Camera
+@@ -2647,7 +2655,7 @@
+ HUT 0a  Ordinal
+       001  Instance 1
+       002  Instance 2
+-      002  Instance 3
++      003  Instance 3
+ HUT 0b  Telephony
+       000  Unassigned
+       001  Phone

diff --git a/usbutils.spec b/usbutils.spec
index a3974ec7b3a0797f709691018e36b1d6bd87a276..e2f419c4825be0139e5abc9e9ac836d780768293 100644 (file)
--- a/usbutils.spec
+++ b/usbutils.spec
@@ -2,12 +2,13 @@ Summary:      Linux USB utilities
 Summary(pl):   Linuksowe narzêdzia do USB
 Name:          usbutils
 Version:       0.11
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       http://usb.in.tum.de/download/usbutils/%{name}-%{version}.tar.gz
 Patch0:                %{name}-no_external_getopt.patch
 Patch1:                %{name}-hwdata_in_misc.patch
+Patch2:                %{name}-ids.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -22,16 +23,17 @@ USB bus. It requires a Linux kernel version 2.3.15 or newer
 %description -l pl
 Pakiet usbutils zawiera narzêdzie do przegl±dania urz±dzeñ
 pod³±czonych do szyny USB. Wymaga j±dra w werji 2.3.15 lub nowszej (z
-obs³ug± interfejsu /proc/bus/usb) lub kernela 2.2 z PLD.
+obs³ug± interfejsu /proc/bus/usb) lub j±dra 2.2 z PLD.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-ln -s ../ltmain.sh libusb/ltmain.sh
+%patch2 -p1
 
 %build
 rm -f missing
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -39,8 +41,8 @@ cd libusb
 rm -f missing
 %{__aclocal}
 %{__autoconf}
-%{__automake}
-%{__libtoolize}
+# don't use --force here!
+automake -a -c --foreign
 cd ..
 %configure
 %{__make}