diff options
Diffstat (limited to 'abs/core/usbutils')
| -rw-r--r-- | abs/core/usbutils/PKGBUILD | 33 | ||||
| -rw-r--r-- | abs/core/usbutils/fix-python2.patch | 17 |
2 files changed, 36 insertions, 14 deletions
diff --git a/abs/core/usbutils/PKGBUILD b/abs/core/usbutils/PKGBUILD index fff0508..08513e5 100644 --- a/abs/core/usbutils/PKGBUILD +++ b/abs/core/usbutils/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 87429 2010-08-13 10:22:39Z tpowa $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> +# Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=0.90 +pkgver=006 pkgrel=1 pkgdesc="USB Device Utilities" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('GPL') groups=('base') -makedepends=('wget') -depends=('glibc' 'libusb') +depends=('libusb' 'hwids') +optdepends=('python2: for lsusb.py usage' + 'coreutils: for lsusb.py usage') url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" + fix-python2.patch) +md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' + '45766196895b4cc50b53cd56e1bbf3d1') build() { cd $srcdir/$pkgname-$pkgver - rm usb.ids - wget http://www.linux-usb.org/usb.ids + # patch lsusb.py to use correct usb.ids file and python2 interpreter + patch -Np1 -i $srcdir/fix-python2.patch ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make || return 1 + make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - # fix pkgconfig file - mkdir -p $pkgdir/usr/lib - mv $pkgdir/usr/share/hwdata/pkgconfig $pkgdir/usr/lib/ + # this is now in the hwids package + rm -rf $pkgdir/usr/{share/hwdata,sbin} } -md5sums=('53f0269e2cba704d5a35dfe291511292') diff --git a/abs/core/usbutils/fix-python2.patch b/abs/core/usbutils/fix-python2.patch new file mode 100644 index 0000000..7e2875e --- /dev/null +++ b/abs/core/usbutils/fix-python2.patch @@ -0,0 +1,17 @@ +--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 ++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # lsusb.py + # Displays your USB devices in reasonable form. + # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. +@@ -16,7 +16,7 @@ + warnsort = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" |