networkmanager-consolekit-1.0.8-2: updating version

1 files changed, 74 insertions, 62 deletions

diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD
index 6033cee6a..22b62a7be 100644
--- a/pcr/networkmanager-consolekit/PKGBUILD
+++ b/pcr/networkmanager-consolekit/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer (Arch): Alexey D. <lq07829icatm@rambler.ru>
+# Maintainer (Arch): artoo <artoo@manjaro.org>
+# Contributor (Arch): Alexey D. <lq07829icatm@rambler.ru>
 # Contributor (Arch): DaZ <daz.root+arch@gmail.coM>
 # Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
@@ -11,39 +12,41 @@
 
 pkgname=networkmanager-consolekit
 _pkgname=NetworkManager
-pkgver=1.0.6
-pkgrel=1
+pkgver=1.0.8
+pkgrel=2
 _pppver=2.4.7
 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL2.1')
 url="http://www.gnome.org/projects/$_pkgname/"
-depends=("libnm-glib>=${pkgver}" 'iproute2' 'libnl' 'polkit-consolekit' 'consolekit' 
-         'wpa_supplicant' 'dhclient' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 
-         'libteam' 'libgudev')
-makedepends=('intltool' 'iptables' 'gobject-introspection' 'gtk-doc' 
-             "ppp=$_pppver" 'modemmanager' 'rp-pppoe' 'vala')
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
-            'iptables: connection sharing'
-            'dnsmasq: connection sharing'
-            'bluez: bluetooth support'
-            'openresolv: resolvconf support'
-            'ppp: dialup connection support')
+depends=('libnm-glib' 'iproute2' 'libnl' 'polkit-consolekit' 'wpa_supplicant' 'dhclient' 'libsoup'
+		'libmm-glib' 'libnewt' 'libndp' 'libteam' 'libgudev' 'consolekit')
+optdepends=('dnsmasq: connection sharing'
+			'bluez: Bluetooth support'
+			'openresolv: resolvconf support'
+			'ppp: dialup connection support'
+			'rp-pppoe: ADSL support'
+			'modemmanager: cellular network support')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc' "ppp=$_pppver"
+             'modemmanager' 'dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'wpa_supplicant' 'libsoup'
+             'udev' 'libgudev' 'libmm-glib' 'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml'
+             'python2-gobject')
 provides=("networkmanager=$pkgver")
-replaces=('networkmanager')
 conflicts=('networkmanager')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf 
-        disable_set_hostname.patch 
-        networkmanager.rc
-        )
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
-            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz"
+        'disable_set_hostname.patch'
+        'NetworkManager.conf'
+        '01-org.freedesktop.ModemManager1.rules'
+        '01-org.freedesktop.NetworkManager.settings.modify.system.rules'
+        '50-org.freedesktop.NetworkManager.rules')
+sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc')
+            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
+            '17b5e3ead960a0d2c3cea3f1549d1e83ada9600f174ab9a96f083abe6d8f962d'
+            '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2'
+            '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4')
 
 prepare() {
   cd $_pkgname-$pkgver
@@ -53,50 +56,59 @@ prepare() {
 }
 
 build() {
-  cd $_pkgname-$pkgver
+	cd $_pkgname-$pkgver
+
+	AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--libexecdir=/usr/lib/networkmanager \
+		--with-crypto=nss \
+		--with-dhclient=/usr/bin/dhclient \
+		--without-dhcpcd \
+		--with-dnsmasq=/usr/bin/dnsmasq \
+		--with-iptables=/usr/bin/iptables \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+		--with-udev-dir=/usr/lib/udev \
+		--with-resolvconf=/usr/bin/resolvconf \
+		--with-pppd=/usr/bin/pppd \
+		--with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
+		--with-pppoe=/usr/bin/pppoe \
+		--with-kernel-firmware-dir=/usr/lib/firmware \
+		--with-session-tracking=ck \
+		--with-modem-manager-1 \
+		--disable-static \
+		--enable-more-warnings=no \
+		--disable-wimax \
+		--enable-modify-system \
+		--enable-doc \
+		--enable-gtk-doc
 
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-dhclient=/usr/bin/dhclient \
-    --without-dhcpcd \
-    --with-dnsmasq=/usr/bin/dnsmasq \
-    --with-iptables=/usr/bin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/bin/resolvconf \
-    --with-pppd=/usr/bin/pppd \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \
-    --with-kernel-firmware-dir=/usr/lib/firmware \
-    --with-session-tracking=ck \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax \
-    --enable-modify-system \
-    --enable-doc
+	make
 
-  make
 }
 
 package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+	cd $_pkgname-$pkgver
+	make DESTDIR="${pkgdir}" install
+	make DESTDIR="$pkgdir" -C libnm uninstall
+	make DESTDIR="$pkgdir" -C libnm-glib uninstall
+	make DESTDIR="$pkgdir" -C libnm-util uninstall
+	make DESTDIR="$pkgdir" -C vapi uninstall
+
+	install -m644 $srcdir/NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+
+	rm -rf "$pkgdir/usr/include"
+	rm -rf "$pkgdir/usr/lib/pkgconfig"
+	rm -r "${pkgdir}/var/run"
 
-  make DESTDIR="$pkgdir" -C libnm uninstall
-  make DESTDIR="$pkgdir" -C libnm-glib uninstall
-  make DESTDIR="$pkgdir" -C libnm-util uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
-  
-  rm -rf "$pkgdir/usr/include"
-  rm -rf "$pkgdir/usr/lib/pkgconfig"
+	install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d
+	install -m 644 ${srcdir}/01-org.freedesktop.ModemManager1.rules $pkgdir/usr/share/polkit-1/rules.d/
+	install -m 644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/usr/share/polkit-1/rules.d/
 
-  install -D -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/NetworkManager.conf"
-  install -D -m755 "${srcdir}/networkmanager.rc"   "${pkgdir}/etc/rc.d/networkmanager"
+	install -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/
 
-  rm -r "${pkgdir}/var/run"
+	#chown root:102 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d
+	#chmod 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d
 }