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

[Jan Steffens]

    Date: Saturday, April 14, 2012 @ 17:16:23
  Author: heftig
Revision: 156159

Return to CK session tracking for now, but keep the patch around in trunk. Move systemd unit files

Modified:
  networkmanager/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-14 20:16:59 UTC (rev 156158)
+++ PKGBUILD	2012-04-14 21:16:23 UTC (rev 156159)
@@ -8,13 +8,13 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.4.0
-pkgrel=1
+pkgrel=2
 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'
-         'libsystemd' 'libsoup')
+         'libsoup')
 makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
@@ -27,20 +27,17 @@
 install=networkmanager.install
 #source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch systemd-fallback.patch)
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
 sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            '5e9bbd8a84883037d27a71ea9969d0cb03f09ca238fa733381bcf136bbc340a5')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../systemd-fallback.patch
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i
 
   ./configure \
     --prefix=/usr \
@@ -52,9 +49,9 @@
     --with-dhclient=/usr/sbin/dhclient \
     --with-dhcpcd=/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/lib/systemd/system \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=systemd \
+    --with-session-tracking=ck \
     --with-wext=no \
     --disable-static \
     --enable-more-warnings=no \