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

[Jan Steffens]

    Date: Saturday, September 29, 2012 @ 06:53:55
  Author: heftig
Revision: 167247

Use dhclient by default; Use systemd session tracking (requires sd-booted); Cleanup

Modified:
  networkmanager/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-29 09:32:53 UTC (rev 167246)
+++ PKGBUILD	2012-09-29 10:53:55 UTC (rev 167247)
@@ -1,4 +1,5 @@
 # $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Maintainer: Jan de Groot <jgc at archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
 # Contributor: Tor Krill <tor at krill.nu>
@@ -8,20 +9,20 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
-         'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
+         libsoup systemd)
+makedepends=(intltool dhcpcd iptables gobject-introspection)
 optdepends=('modemmanager: for modem management service'
-            'dhclient: alternative DHCP/DHCPv6 client'
+            'dhcpcd: alternative DHCP client; does not support DHCPv6'
             'iptables: Connection sharing'
             'dnsmasq: Connection sharing'
             'bluez: Bluetooth support'
-            'openresolv: openresolv support')
+            'openresolv: resolvconf support')
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
@@ -56,7 +57,7 @@
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
     --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=ck \
+    --with-session-tracking=systemd \
     --disable-static \
     --enable-more-warnings=no \
     --disable-wimax
@@ -71,7 +72,4 @@
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
 
   rm -r "$pkgdir/var/run"
-
-  # Provide native service for arch-daemons generator
-  ln -s NetworkManager.service "$pkgdir/usr/lib/systemd/system/networkmanager.service"
 }