version 1.0.12-1

2 files changed, 11 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6405601f3185..4471f5d66213 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jan 27 07:49:28 UTC 2016
+# Sun Apr  3 05:49:22 UTC 2016
 pkgbase = networkmanager-consolekit
 	pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems
-	pkgver = 1.0.10
+	pkgver = 1.0.12
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
 	install = networkmanager.install
@@ -19,8 +19,8 @@ pkgbase = networkmanager-consolekit
 	makedepends = rp-pppoe
 	makedepends = vala
 	makedepends = perl-yaml
-	makedepends = python2-gobject
-	depends = libnm-glib>=1.0.10
+	makedepends = python-gobject
+	depends = libnm-glib>=1.0.12
 	depends = iproute2
 	depends = libnl
 	depends = polkit-consolekit
@@ -40,17 +40,15 @@ pkgbase = networkmanager-consolekit
 	optdepends = bluez: bluetooth support
 	optdepends = openresolv: resolvconf support
 	optdepends = ppp: dialup connection support
-	provides = networkmanager=1.0.10
+	provides = networkmanager=1.0.12
 	conflicts = networkmanager
 	replaces = networkmanager
 	backup = etc/NetworkManager/NetworkManager.conf
-	source = https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz
-	source = 0001-core-fix-failure-to-configure-routes.patch
+	source = https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.12.tar.xz
 	source = NetworkManager.conf
 	source = disable_set_hostname.patch
 	source = networkmanager.rc
-	sha256sums = 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc
-	sha256sums = 27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7
+	sha256sums = 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e
 	sha256sums = 2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b
 	sha256sums = 25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460
 	sha256sums = e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc
diff --git a/PKGBUILD b/PKGBUILD
index f30ce9c8c829..4564472be4bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Valentine Sinitsyn <e_val@inbox.ru>
 
 pkgname=networkmanager-consolekit
-pkgver=1.0.10
+pkgver=1.0.12
 pkgrel=1
 _pppver=2.4.7
 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems"
@@ -21,7 +21,7 @@ depends=("libnm-glib>=${pkgver}" 'iproute2' 'libnl' 'polkit-consolekit' 'console
          'libteam' 'libgudev')
 makedepends=('intltool' 'iptables' 'gobject-introspection' 'gtk-doc' 
              "ppp=$_pppver" 'modemmanager' 'rp-pppoe' 'vala' 'perl-yaml' 
-             'python2-gobject')
+             'python-gobject')
 optdepends=('modemmanager: for modem management service'
             'dhcpcd: alternative DHCP client; does not support DHCPv6'
             'iptables: connection sharing'
@@ -35,32 +35,26 @@ conflicts=('networkmanager')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        0001-core-fix-failure-to-configure-routes.patch
         NetworkManager.conf 
         disable_set_hostname.patch 
         networkmanager.rc
         )
-sha256sums=('1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc'
-            '27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7'
+sha256sums=('3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e'
             '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
             'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc')
 
 prepare() {
-  mkdir path
-  ln -s /usr/bin/python2 path/python
-
   cd NetworkManager-$pkgver
 
-  patch -Np1 -i ../0001-core-fix-failure-to-configure-routes.patch
   patch -Np1 -i ../disable_set_hostname.patch
+  2to3 -w libnm src tools
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd NetworkManager-$pkgver
 
-  export PATH="$srcdir/path:$PATH"
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \