[arch-commits] Commit in wifi-radar/trunk (PKGBUILD wifi-radar.install)

[Jelle van der Waa]

    Date: Wednesday, August 21, 2013 @ 19:20:23
  Author: jelle
Revision: 96199

upgpkg: wifi-radar 2.0.s08-7

fix FS#35823 and  FS#35822

Modified:
  wifi-radar/trunk/PKGBUILD
Deleted:
  wifi-radar/trunk/wifi-radar.install

--------------------+
 PKGBUILD           |   14 ++++++++++----
 wifi-radar.install |    4 ----
 2 files changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-21 15:11:15 UTC (rev 96198)
+++ PKGBUILD	2013-08-21 17:20:23 UTC (rev 96199)
@@ -7,7 +7,7 @@
 
 pkgname=wifi-radar
 pkgver=2.0.s08
-pkgrel=6
+pkgrel=7
 pkgdesc="A PyGTK2 utility for managing WiFi profiles"
 arch=('any')
 url="http://wifi-radar.berlios.de/"
@@ -15,7 +15,6 @@
 depends=('net-tools' 'pygtk' 'wireless_tools')
 optdepends=('polkit-gnome: needed if you launch wifi-radar from menu')
 backup=('etc/wifi-radar.conf')
-install=$pkgname.install
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2
         org.archlinux.pkexec.wifi-radar.policy)
 md5sums=('cbad24805d5dc6696e38dc1df619c819'
@@ -28,8 +27,12 @@
   sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $pkgname
 
   # Fix iwlist and iwconfig path
-  sed -i 's|/sbin/iwlist|/usr/bin/iwlist|' $pkgname
-  sed -i 's|/sbin/iwconfig|/usr/bin/iwconfig|' $pkgname
+   sed -i -e 's|/sbin/iwlist|/usr/bin/iwlist|' \
+     -i -e 's|/sbin/iwconfig|/usr/bin/iwconfig|' \
+     -i -e 's|/sbin/ifconfig|/usr/bin/ifconfig|' \
+     -i -e 's|/sbin/route|/usr/bin/route|' \
+     -i -e 's|/sbin/dhcpcd|/usr/bin/dhcpcd|' \
+     -i -e 's|/usr/sbin/wpa_supplicant|/usr/bin/wpa_supplicant|' $pkgname
 
   make
 }
@@ -37,6 +40,9 @@
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR="$pkgdir/usr" sysconfdir="$pkgdir/etc" sbindir="$pkgdir/usr/bin" install
 
+  # remove empty /etc dir
+  rmdir $pkgdir/etc
+
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.wifi-radar.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.wifi-radar.policy"
 

Deleted: wifi-radar.install
===================================================================
--- wifi-radar.install	2013-08-21 15:11:15 UTC (rev 96198)
+++ wifi-radar.install	2013-08-21 17:20:23 UTC (rev 96199)
@@ -1,4 +0,0 @@
-post_remove(){
-  rm etc/wifi-radar.conf &> /dev/null
-  rm var/log/wifi-radar.log &> /dev/null
-}