version 0.9.6.0-2

3 files changed, 44 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc270ca7b41c..0d9548e45447 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = networkmanager-pptp-gtk2
 	pkgdesc = NetworkManager VPN plugin for pptp
-	pkgver = 0.9.8.4
-	pkgrel = 1
+	pkgver = 0.9.6.0
+	pkgrel = 2
 	url = http://www.gnome.org/projects/NetworkManager/
 	install = networkmanager-pptp.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = intltool
-	depends = networkmanager>=0.9.8
+	depends = networkmanager>=0.9.6.0
 	depends = pptpclient
 	depends = gtk2
 	depends = libgnome-keyring
@@ -16,10 +16,10 @@ pkgbase = networkmanager-pptp-gtk2
 	provides = networkmanager-pptp
 	conflicts = networkmanager-pptp
 	options = !libtool
-	source = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-0.9.8.4.tar.xz
-	source = gtk_table_to_gtk_grid.patch
-	sha256sums = 97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8
-	sha256sums = 17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215
+	source = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-0.9.6.0.tar.xz
+	source = fix-path-to-auth-dialog.patch
+	sha256sums = a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4
+	sha256sums = 35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a
 
 pkgname = networkmanager-pptp-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 94c093656923..06a113c6feaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,33 @@
-# $Id: PKGBUILD 194798 2013-09-23 17:24:22Z heftig $
+# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp-gtk2
-_pkgname=networkmanager-pptp
-pkgver=0.9.8.4
-pkgrel=1
+pkgver=0.9.6.0
+pkgrel=2
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'pptpclient' 'gtk2' 'libgnome-keyring')
+depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk2' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
-provides=($_pkgname)
-conflicts=($_pkgname)
+provides=('networkmanager-pptp')
+conflicts=('networkmanager-pptp')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
-        gtk_table_to_gtk_grid.patch)
-sha256sums=('97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8'
-            '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
-
-prepare() {
-  cd NetworkManager-pptp-${pkgver}
-#  patch -Np1 -i ../gtk_table_to_gtk_grid.patch
-}
+        fix-path-to-auth-dialog.patch)
+sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
+            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
+  patch -Np1 -i ../fix-path-to-auth-dialog.patch
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
 	--disable-static \
-	--with-gtkver=2 \
-	--enable-more-warnings=no
+	--with-gtkver=2
   make
 }
 
diff --git a/fix-path-to-auth-dialog.patch b/fix-path-to-auth-dialog.patch
new file mode 100644
index 000000000000..28a4a5a44b6e
--- /dev/null
+++ b/fix-path-to-auth-dialog.patch
@@ -0,0 +1,26 @@
+From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
+From: Clemens Buchacher <drizzd@aon.at>
+Date: Sun, 1 Jul 2012 18:35:50 +0200
+Subject: [PATCH] fix path to auth-dialog
+
+
+Signed-off-by: Clemens Buchacher <drizzd@aon.at>
+---
+ nm-pptp-service.name.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
+index 9ee79b8..ea5f0e5 100644
+--- a/nm-pptp-service.name.in
++++ b/nm-pptp-service.name.in
+@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
+ program=@LIBEXECDIR@/nm-pptp-service
+ 
+ [GNOME]
+-auth-dialog=nm-pptp-auth-dialog
++auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
+ properties=libnm-pptp-properties
+ supports-external-ui-mode=true
+-- 
+1.7.11.1
+