update: upstream version: 1.0.8

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f031774d69d7..bbd2bbba90cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-networkmanager
 	pkgdesc = Network Management daemon, 32bit libraries
-	pkgver = 1.0.6
+	pkgver = 1.0.8
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
 	arch = i686
@@ -8,8 +8,7 @@ pkgbase = lib32-networkmanager
 	license = GPL2
 	license = LGPL2.1
 	checkdepends = libx11
-	checkdepends = python-gobject
-	checkdepends = python-dbus
+	checkdepends = python2-dbus
 	makedepends = intltool
 	makedepends = dhclient
 	makedepends = iptables
@@ -27,10 +26,12 @@ pkgbase = lib32-networkmanager
 	makedepends = lib32-libndp
 	makedepends = lib32-libteam
 	makedepends = vala
+	makedepends = perl-yaml
+	makedepends = python2-gobject
 	makedepends = networkmanager
-	source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.6.tar.xz
+	source = http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.0/NetworkManager-1.0.8.tar.xz
 	source = disable_set_hostname.patch
-	sha256sums = 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd
+	sha256sums = 8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f
 	sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
 
 pkgname = lib32-networkmanager
diff --git a/PKGBUILD b/PKGBUILD
index 57550dbf351b..df6873239c94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 pkgbase=lib32-networkmanager
 pkgname=(lib32-networkmanager lib32-libnm-glib)
 _pkgname=NetworkManager
-pkgver=1.0.6
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Network Management daemon, 32bit libraries"
 arch=(i686 x86_64)
@@ -18,20 +18,25 @@ url="http://www.gnome.org/projects/NetworkManager/"
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc
              lib32-dbus-glib iproute2 lib32-libnl lib32-nss lib32-polkit wpa_supplicant
              lib32-libsoup lib32-systemd lib32-libgudev lib32-libndp
-             lib32-libteam vala networkmanager)
-checkdepends=(libx11 python-gobject python-dbus)
+             lib32-libteam vala perl-yaml python2-gobject networkmanager)
+checkdepends=(libx11 python2-dbus)
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         disable_set_hostname.patch)
-sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
+sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 prepare() {
-  cd NetworkManager-$pkgver
+	mkdir path
+	ln -s /usr/bin/python2 path/python
+
+	cd NetworkManager-$pkgver
   patch -Np1 -i ../disable_set_hostname.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
+	export PATH="$srcdir/path:$PATH"
+
 	export CC='gcc -m32'
 	export CXX='g++ -m32'
 	export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
@@ -63,12 +68,14 @@ build() {
     --disable-ppp \
     --enable-modify-system \
     --disable-doc \
+    --disable-gtk-doc \
     --disable-qt # disable qt examples, lib32-qt4 contains wrong include dirs in pkgconfig
 
   make
 }
 
 check() {
+	export PATH="$srcdir/path:$PATH"
   cd NetworkManager-$pkgver
   make -k check
 }