[arch-commits] Commit in usbutils/trunk (PKGBUILD fix-python2.patch)

[Tobias Powalowski]

    Date: Saturday, April 9, 2011 @ 16:52:11
  Author: tpowa
Revision: 118970

upgpkg: usbutils 002-2
fix #23624

Added:
  usbutils/trunk/fix-python2.patch
Modified:
  usbutils/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   12 +++++++++---
 fix-python2.patch |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-09 20:52:05 UTC (rev 118969)
+++ PKGBUILD	2011-04-09 20:52:11 UTC (rev 118970)
@@ -3,21 +3,27 @@
 # Contributor: Curtis Campbell <curtisjamescampbell at hotmail.com>
 pkgname=usbutils
 pkgver=002
-pkgrel=1
+pkgrel=2
 pkgdesc="USB Device Utilities"
 arch=(i686 x86_64)
 license=('GPL')
 groups=('base')
 makedepends=('wget')
 depends=('glibc' 'libusb')
+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)
-md5sums=('05610d15c3c8c8ada3d691c320ca784a')
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+        fix-python2.patch)
+md5sums=('05610d15c3c8c8ada3d691c320ca784a'
+         '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 ../fix-python2.patch
   ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
   make
 }

Added: fix-python2.patch
===================================================================
--- fix-python2.patch	                        (rev 0)
+++ fix-python2.patch	2011-04-09 20:52:11 UTC (rev 118970)
@@ -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 at 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"