[arch-commits] Commit in wicd/trunk (PKGBUILD)

[Rémy Oudompheng]

    Date: Saturday, September 4, 2010 @ 13:26:56
  Author: remy
Revision: 89902

upgpkg: wicd 1.7.0-5
Rebuild for python 2.7

Modified:
  wicd/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-04 17:26:43 UTC (rev 89901)
+++ PKGBUILD	2010-09-04 17:26:56 UTC (rev 89902)
@@ -4,12 +4,12 @@
 
 pkgname=wicd
 pkgver=1.7.0
-pkgrel=4
+pkgrel=5
 pkgdesc="New and alternative wireless/wired network management utility"
-arch=('i686' 'x86_64')
+arch=(any)
 url="http://wicd.sourceforge.net/"
 license=('GPL2')
-depends=('python' 'dbus-python' 'pygtk' 'dhcpcd' 'wpa_supplicant' 'wireless_tools' 'ethtool' 'shared-mime-info' 'python-urwid' 'consolekit')
+depends=('python2' 'dbus-python' 'pygtk' 'dhcpcd' 'wpa_supplicant' 'wireless_tools' 'ethtool' 'shared-mime-info' 'python-urwid' 'consolekit')
 optdepends=('hicolor-icon-theme'
             'gksu:		needed to access some preferences in gtk interface'
             'notification-daemon: needed if you want notifications'
@@ -31,20 +31,26 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p0 <$srcdir/wicd-scripts-execution.patch || return 1
-  python setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ \
-                            --suspend=/usr/share/wicd/scripts/ --verbose
-  python setup.py install --root=$pkgdir
+  patch -p0 <$srcdir/wicd-scripts-execution.patch
+  find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
+  export PYTHON=python2
+  python2 setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ \
+                            --suspend=/usr/share/wicd/scripts/ --verbose --python=/usr/bin/python2
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  python2 setup.py install --root=$pkgdir
+
   # Add custom rc.d script
   install -Dm755 $srcdir/wicd-daemon $pkgdir/etc/rc.d/wicd
   install -Dm644 $srcdir/wicd.desktop $pkgdir/usr/share/applications/wicd.desktop
 
   cd build/lib/wicd
   for i in *.py; do
-    install -Dm 755 $i $startdir/pkg/usr/lib/wicd/$i
+    install -Dm 755 $i $pkgdir/usr/lib/wicd/$i
   done
   
-  rm -rf  ${startdir}/pkg/usr/share/autostart
+  rm -rf $pkgdir/usr/share/autostart
 }