From a13164244bb806885ba17248919864b264823a63 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Sat, 22 Nov 2008 04:10:16 +0000
Subject: [PATCH] - Rebuild for updated NetworkManager

---
 .cvsignore               |  1 +
 NetworkManager-pptp.spec |  9 +++++----
 nm-pptp-free.patch       | 12 ------------
 sources                  |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 nm-pptp-free.patch

diff --git a/.cvsignore b/.cvsignore
index c02f691..aa50ae7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 NetworkManager-pptp-0.7.0.svn4027.tar.bz2
 NetworkManager-pptp-0.7.0.svn4178.tar.bz2
 NetworkManager-pptp-0.7.0.svn4229.tar.bz2
+NetworkManager-pptp-0.7.0.svn4326.tar.bz2
diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index 4445283..c926838 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -1,10 +1,10 @@
-%define nm_version          1:0.7.0-0.11.svn4229
+%define nm_version          1:0.7.0-0.12.svn4326
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4229
+%define svn_snapshot svn4326
 
 Summary:   NetworkManager VPN integration for pptp
 Name:      NetworkManager-pptp
@@ -17,7 +17,6 @@ URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Patch0: nm-pptp-free.patch
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
@@ -49,7 +48,6 @@ the NetworkManager and the GNOME desktop.
 %prep
 %setup -q
 
-%patch0 -p1 -b .free
 
 %build
 %configure --enable-more-warnings=yes
@@ -105,6 +103,9 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 
 %changelog
+* Fri Nov 21 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-12.svn4326
+- Rebuild for updated NetworkManager
+
 * Wed Oct 29 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-12.svn4229
 - Fix hang in auth dialog (rh #467007)
 
diff --git a/nm-pptp-free.patch b/nm-pptp-free.patch
deleted file mode 100644
index da7ed22..0000000
--- a/nm-pptp-free.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-pptp-0.7.0/auth-dialog/main.c.free NetworkManager-pptp-0.7.0/auth-dialog/main.c
---- NetworkManager-pptp-0.7.0/auth-dialog/main.c.free	2008-10-29 23:06:48.000000000 -0400
-+++ NetworkManager-pptp-0.7.0/auth-dialog/main.c	2008-10-29 23:07:37.000000000 -0400
-@@ -171,7 +171,7 @@ main (int argc, char *argv[])
- 
- 	if (password) {
- 		memset (password, 0, strlen (password));
--		g_free (password);
-+		gnome_keyring_memory_free (password);
- 	}
- 	exit_status = 0;
- 
diff --git a/sources b/sources
index 3311ed5..a4712f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0638ecb71c4f9047ca1036159134db3  NetworkManager-pptp-0.7.0.svn4229.tar.bz2
+b9b6d1e987be04279fa2610eb208e09e  NetworkManager-pptp-0.7.0.svn4326.tar.bz2