[arch-commits] CVS update of extra/network/wicd (PKGBUILD)

[Varun Acharya]

    Date: Wednesday, December 19, 2007 @ 21:03:21
  Author: varun
    Path: /home/cvs-extra/extra/network/wicd

Modified: PKGBUILD (1.10 -> 1.11)

upgpkg: wicd 1.3.8-1


----------+
 PKGBUILD |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)


Index: extra/network/wicd/PKGBUILD
diff -u extra/network/wicd/PKGBUILD:1.10 extra/network/wicd/PKGBUILD:1.11
--- extra/network/wicd/PKGBUILD:1.10	Fri Nov 23 03:41:47 2007
+++ extra/network/wicd/PKGBUILD	Wed Dec 19 21:03:21 2007
@@ -2,8 +2,8 @@
 # Contributor: Rashif "Don Ray" Rahman <rayrashif at gmail.com>
 
 pkgname=wicd
-pkgver=1.3.1
-pkgrel=10
+pkgver=1.3.8
+pkgrel=1
 pkgdesc="New and alternative wireless/wired network management utility"
 arch=('i686' 'x86_64')
 url="http://wicd.sourceforge.net/"
@@ -12,21 +12,19 @@
 conflicts=()
 install=wicd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/wicd_$pkgver-src.tar.bz2 \
-        wicd-daemon wicd.desktop)
+        wicd-daemon wicd.desktop wicd_in_usr.patch)
 options=(emptydirs)
-md5sums=('7ec32f0a88fee1ed61da038244eb692c' \
+md5sums=('a44eed73fb45a8b92fdc4b6ea646feb9' \
          '8835ed1d4aba7effe3f157eeb0b66443' \
          'a37f63a6c82491116d5b69540ae13d25')
                        
   
 build() {
    
-  # wicd moved to /usr/lib
-  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/etc/acpi/resume.d/80-wicd-connect.sh || return 1
-  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/etc/init.d/wicd || return 1
-  sed -i -e 's_/opt_/usr/lib_' ${startdir}/src/opt/wicd/gui.py || return 1
-  sed -i -e 's_images/_/usr/share/wicd/images/_' ${startdir}/src/opt/wicd/{edgy,dapper,gui}.py
-
+  #Change default location to /usr/lib
+  
+  patch -Np1 -i ${startdir}/wicd_in_usr.patch
+  
   #Create Directories
   mkdir -p ${startdir}/pkg/usr/lib
   mkdir -p ${startdir}/pkg/usr/share/locale
@@ -48,7 +46,7 @@
   rm ${startdir}/pkg/usr/lib/wicd/data/wicd.png
   rm ${startdir}/pkg/usr/lib/wicd/tray-dapper.py
   rm ${startdir}/pkg/usr/lib/wicd/tray-edgy.py
-  
+
   # Leave init.d pseudo-daemon and add custom rc.d script
   cd ${startdir}
   install -D -m755 wicd-daemon pkg/etc/rc.d/wicd