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

[Jan Steffens]

    Date: Saturday, October 17, 2015 @ 04:46:17
  Author: heftig
Revision: 249452

1.0.7

Modified:
  networkmanager/trunk/PKGBUILD
Deleted:
  networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch

------------------------------------------+
 0001-Add-Requires.private-glib-2.0.patch |   26 ------------------
 PKGBUILD                                 |   40 ++++++++++++++++-------------
 2 files changed, 23 insertions(+), 43 deletions(-)

Deleted: 0001-Add-Requires.private-glib-2.0.patch
===================================================================
--- 0001-Add-Requires.private-glib-2.0.patch	2015-10-17 01:02:13 UTC (rev 249451)
+++ 0001-Add-Requires.private-glib-2.0.patch	2015-10-17 02:46:17 UTC (rev 249452)
@@ -1,26 +0,0 @@
-From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter at math.unl.edu>
-Date: Thu, 27 Aug 2015 11:13:40 -0500
-Subject: [PATCH] Add Requires.private: glib-2.0
-
-since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
-a dependency to glib was added, but this wasn't reflected in pkg-config
-deps... until now.
----
- NetworkManager.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
-index 877c344..a0557ee 100644
---- a/NetworkManager.pc.in
-+++ b/NetworkManager.pc.in
-@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
- Name: NetworkManager
- Description: System for maintaining active network connection
- Requires:
-+Requires.private: glib-2.0
- Version: @VERSION@
- Cflags: -I${includedir}/NetworkManager
--- 
-1.9.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-17 01:02:13 UTC (rev 249451)
+++ PKGBUILD	2015-10-17 02:46:17 UTC (rev 249452)
@@ -8,8 +8,8 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -17,25 +17,29 @@
 _pppver=2.4.7
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
              modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup
-             systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
-checkdepends=(libx11 python-gobject python-dbus)
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch
-        0001-Add-Requires.private-glib-2.0.patch)
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
+             systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml
+             python2-gobject git)
+checkdepends=(libx11 python2-dbus)
+#source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
+_commit=ba46efd07777350be737dbdac9df9becb86e8f77
+source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('SKIP'
             '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 prepare() {
-  cd NetworkManager-$pkgver
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd NetworkManager
   patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd NetworkManager-$pkgver
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -59,13 +63,15 @@
     --enable-more-warnings=no \
     --disable-wimax \
     --enable-modify-system \
-    --enable-doc
+    --enable-doc \
+    --enable-gtk-doc
 
   make
 }
 
 check() {
-  cd NetworkManager-$pkgver
+  export PATH="$srcdir/path:$PATH"
+  cd NetworkManager
   make -k check
 }
 
@@ -81,7 +87,7 @@
   install=networkmanager.install
   backup=('etc/NetworkManager/NetworkManager.conf')
 
-  cd NetworkManager-$pkgver
+  cd NetworkManager
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C libnm uninstall
   make DESTDIR="$pkgdir" -C libnm-glib uninstall
@@ -106,7 +112,7 @@
   mv include "$pkgdir/usr"
   mv pkgconfig "$pkgdir/usr/lib"
 
-  cd NetworkManager-$pkgver
+  cd NetworkManager
   make DESTDIR="$pkgdir" -C libnm install
   make DESTDIR="$pkgdir" -C libnm-util install
   make DESTDIR="$pkgdir" -C libnm-glib install