networkmanager-consolekit-1.6.2-1.parabola1: updating version

2 files changed, 62 insertions, 24 deletions

diff --git a/pcr/networkmanager-consolekit/20-connectivity.conf b/pcr/networkmanager-consolekit/20-connectivity.conf
new file mode 100644
index 000000000..7c58de654
--- /dev/null
+++ b/pcr/networkmanager-consolekit/20-connectivity.conf
@@ -0,0 +1,2 @@
+[connectivity]
+uri=http://pkgbuild.com/check_network_status.txt
diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD
index 88c2ee55d..36b5dcd18 100644
--- a/pcr/networkmanager-consolekit/PKGBUILD
+++ b/pcr/networkmanager-consolekit/PKGBUILD
@@ -10,7 +10,7 @@
 _pppver=2.4.7
 
 pkgname=networkmanager-consolekit
-pkgver=1.6.0
+pkgver=1.6.2
 pkgrel=1.parabola1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'armv7h')
@@ -34,14 +34,18 @@ optdepends=('dnsmasq: connection sharing'
             'modemmanager: cellular network support')
 backup=('etc/NetworkManager/NetworkManager.conf')
 
-source=("https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz"
+_commit=037a12f96eff09aa48481fda7ea602a3388afc74  # tags/1.6.2^0
+source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
+        #"https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz"
         'NetworkManager.conf'
         '01-org.freedesktop.NetworkManager.settings.modify.system.rules'
-        '50-org.freedesktop.NetworkManager.rules')
-sha256sums=('eabc8b03770411248d5301c52f6e12ba732f22b6c330c804335f2033cbde4339'
+        '50-org.freedesktop.NetworkManager.rules'
+        '20-connectivity.conf')
+sha256sums=('SKIP'
             '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103'
             '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2'
-            '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4')
+            '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4'
+            '1961f50c8ed2668052bb543a29a11ccf8a5a1226473234a915aa139ceb32d472')
 
 # pkgver() {
 #   cd NetworkManager
@@ -49,15 +53,28 @@ sha256sums=('eabc8b03770411248d5301c52f6e12ba732f22b6c330c804335f2033cbde4339'
 # }
 
 prepare() {
-  cd NetworkManager-$pkgver
-
-  2to3 -w libnm src tools
+  mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
 
+  cd NetworkManager
   NOCONFIGURE=1 ./autogen.sh
 }
 
+pkgver() {
+  cd NetworkManager
+  git describe | sed 's/-dev/dev/;s/-/+/g'
+}
+
+
+# prepare() {
+#   cd NetworkManager-$pkgver
+#
+#   2to3 -w libnm src tools
+#
+#   NOCONFIGURE=1 ./autogen.sh
+# }
+
 build() {
-    cd NetworkManager-$pkgver
+    cd NetworkManager #-$pkgver
     ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
@@ -124,31 +141,50 @@ build() {
 }
 
 check() {
-    cd NetworkManager-$pkgver
+    cd NetworkManager #-$pkgver
     make -k check
 }
 
 package() {
-    cd NetworkManager-$pkgver
+    cd NetworkManager #-$pkgver
     make DESTDIR="$pkgdir" install
 
-    # remove conflicting files from libnm, etc
-    rm ${pkgdir}/usr/lib/libnm*
-    rm ${pkgdir}/usr/share/vala/vapi/libnm*
-    rm -rf ${pkgdir}/usr/lib/girepository-1.0/*
-    rm -rf ${pkgdir}/usr/share/gir-1.0
-    rm -rf ${pkgdir}/usr/share/gtk-doc
-
-    # Some stuff to move is left over
-    rm -r "$pkgdir/usr/include"
-    rm -r "$pkgdir/usr/lib/pkgconfig"
-
-    install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-    install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+    ### rm libnm
+
+    cd ../libnm
+    rm -rv "$pkgdir"/usr/include/libnm
+    rm -rv  "$pkgdir"/usr/lib/girepository-1.0/NM-*
+    rm -rv  "$pkgdir"/usr/lib/libnm.* usr/lib
+    rm -rv  "$pkgdir"/usr/lib/pkgconfig/libnm.pc
+    rm -rv  "$pkgdir"/usr/share/gir-1.0/NM-*
+    rm -rv  "$pkgdir"/usr/share/gtk-doc/html/libnm
+    rm -rv  "$pkgdir"/usr/share/vala/vapi/libnm.*
+
+    ### rm libnm-glib
+
+    cd ../libnm-glib
+    rm -rv  "$pkgdir"/usr/include/*
+    rm -rv  "$pkgdir"/usr/lib/girepository-1.0/*
+    rm -rv  "$pkgdir"/usr/lib/libnm-*
+    rm -rv  "$pkgdir"/usr/lib/pkgconfig/*
+    rm -rv  "$pkgdir"/usr/share/gir-1.0/*
+    rm -rv  "$pkgdir"/usr/share/gtk-doc/html/libnm-*
+    rm -rv  "$pkgdir"/usr/share/vala/vapi/*
+
+    rmdir -p --ignore-fail-on-non-empty \
+    "$pkgdir"/usr/include \
+    "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \
+    "$pkgdir"/usr/share/{gir-1.0,vala/vapi}
+
+    install -m644 ${srcdir}/NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+    install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
+    install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
 
     install -dm 750 -o polkitd "${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 -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/
+
+    install -Dm644 ${srcdir}/20-connectivity.conf "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf"
 }