[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD config wpa_supplicant.install)

[Jan de Groot]

    Date: Friday, November 14, 2008 @ 17:02:53
  Author: jgc
Revision: 19103

upgpkg: wpa_supplicant 0.5.10-2
    Fix manpath, replace install scriptlet with optdepends, enable dbus

Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/config
Deleted:
  wpa_supplicant/trunk/wpa_supplicant.install

------------------------+
 PKGBUILD               |   31 +++++++++++++++++++------------
 config                 |    4 ++--
 wpa_supplicant.install |   15 ---------------
 3 files changed, 21 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-14 21:57:05 UTC (rev 19102)
+++ PKGBUILD	2008-11-14 22:02:53 UTC (rev 19103)
@@ -3,11 +3,12 @@
 pkgname=wpa_supplicant
 pkgver=0.5.10
 _madwifi_ver=0.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 arch=('i686' 'x86_64')
-makedepends=('kernel26>=2.6.24' 'kernel26<2.6.25')
-depends=('openssl')
+makedepends=('kernel26>=2.6.27' 'kernel26<2.6.28')
+depends=('openssl' 'dbus-core>=1.2.4')
+optdepends=('wpa_supplicant_gui: wpa_gui program')
 license=('GPL')
 groups=('base')
 backup=('etc/wpa_supplicant.conf')
@@ -15,22 +16,28 @@
 source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
         config
 	http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-${_madwifi_ver}.tar.gz)
-install='wpa_supplicant.install'
 md5sums=('9e7b99da67c47d81121368c6d580d069'
-         '87a7bb38e0b4820b29065a9b3e8f4e06'
+         '94fb8071fc440dca8294c9591486921f'
          '399d20de8d855a59f20058857c2178ad')
 
 build() {
-  cd ${startdir}/src/
+  cd "${srcdir}"
   mv madwifi-${_madwifi_ver} madwifi
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   cp ../config ./.config
   sed -i 's@/usr/local@$(PREFIX)@g' Makefile
   sed -i 's at dynamic_eap_methods@@g' Makefile
   make || return 1
-  make PREFIX=/usr DESTDIR=$startdir/pkg install || return 1
-  install -D -m644 wpa_supplicant.conf $startdir/pkg/etc/wpa_supplicant.conf || return 1
-  install -d -m755 $startdir/pkg/usr/man/man{5,8} || return 1
-  install -m644 doc/docbook/wpa_supplicant.conf.5 $startdir/pkg/usr/man/man5 || return 1
-  install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 $startdir/pkg/usr/man/man8 || return 1
+  make PREFIX=/usr DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/etc"
+  install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" || return 1
+  install -d -m755 ${pkgdir}/usr/share/man/man{5,8} || return 1
+  install -m644 doc/docbook/wpa_supplicant.conf.5 "${pkgdir}/usr/share/man/man5/" || return 1
+  install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 "${pkgdir}/usr/share/man/man8/" || return 1
+
+  install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services"
+  install -m644 dbus-wpa_supplicant.service "${pkgdir}/usr/share/dbus-1/system-services/" || return 1
+  sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/dbus-wpa_supplicant.service" || return 1
+  install -m755 -d "${pkgdir}/etc/dbus-1/system.d"
+  install -m644 dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/" || return 1
 }

Modified: config
===================================================================
--- config	2008-11-14 21:57:05 UTC (rev 19102)
+++ config	2008-11-14 22:02:53 UTC (rev 19103)
@@ -273,7 +273,7 @@
 #PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
 
 # Add support for DBus control interface
-#CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS=y
 
 # Add support for loading EAP methods dynamically as shared libraries.
 # When this option is enabled, each EAP method can be either included
@@ -304,5 +304,5 @@
 # to be able to include some of the kernel header files. Following lines can
 # be used to set these (WIRELESS_DEV must point to the root directory of the
 # wireless-dev.git tree).
-WIRELESS_DEV=/lib/modules/2.6.24-ARCH/build
+WIRELESS_DEV=/lib/modules/2.6.27-ARCH/build
 CFLAGS += -I$(WIRELESS_DEV)/net/mac80211

Deleted: wpa_supplicant.install
===================================================================
--- wpa_supplicant.install	2008-11-14 21:57:05 UTC (rev 19102)
+++ wpa_supplicant.install	2008-11-14 22:02:53 UTC (rev 19103)
@@ -1,15 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  post_upgrade
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  echo "==> For wpa_gui please install 'wpa_supplicant_gui'"
-}
-
-op=$1
-shift
-
-$op $*