From 347395e34591df5bb86b2627960fc62410700409 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Nov 22 2008 04:01:59 +0000
Subject: - Rebuild for updated NetworkManager


---

diff --git a/NetworkManager-openvpn-0.7.0-remote-ip.patch b/NetworkManager-openvpn-0.7.0-remote-ip.patch
deleted file mode 100644
index 4ee9eea..0000000
--- a/NetworkManager-openvpn-0.7.0-remote-ip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/nm-openvpn-service-openvpn-helper.c
-===================================================================
---- src/nm-openvpn-service-openvpn-helper.c	(Revision 3632)
-+++ src/nm-openvpn-service-openvpn-helper.c	(Arbeitskopie)
-@@ -202,8 +202,15 @@
- 	val = addr_to_gvalue (getenv ("trusted_ip"));
- 	if (val)
- 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
--	else
--		helper_failed (connection, "VPN Gateway");
-+	else {
-+		/* 	workaround, it looks like openvpn 
-+			sometimes uses remote_1, and sometimes trusted_ip */
-+		val = addr_to_gvalue (getenv ("remote_1"));
-+		if (val)
-+			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val);
-+		else		
-+			helper_failed (connection, "VPN Gateway");
-+	}	
- 
- 	/* Tunnel device */
- 	val = str_to_gvalue (getenv ("dev"), FALSE);
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 7b2bf42..214e873 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,12 +1,12 @@
-%define nm_version          1:0.7.0-0.11.svn4022
+%define nm_version          1:0.7.0-0.12.svn4326
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4027
+%define svn_snapshot svn4326
 
-Summary: NetworkManager VPN integration for OpenVPN
+Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
@@ -21,7 +21,6 @@ Group: System Environment/Base
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
-Patch0: nm-openvpn-fix-pw-tls-entries.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -57,7 +56,6 @@ with NetworkManager and the GNOME desktop.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .pw-tls-entries
 
 %build
 if [ ! -f configure ]; then
@@ -108,6 +106,17 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
 
 %changelog
+* Fri Nov 21 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-16.svn4326
+- Rebuild for updated NetworkManager
+
+* Mon Oct 27 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-16.svn4229
+- Rebuild for updated NetworkManager
+
+* Sun Oct 12 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-16.svn4175
+- Rebuild for updated NetworkManager
+- Allow changing passwords from the connection editor
+- Honor OpenVPN's 'route-vpn-gateway' option
+
 * Tue Sep 30 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-16.svn4027
 - Fix order of Password TLS certificate choosers (rh #464765)
 - Use %find_lang for locale-specific files (rh #448551)
diff --git a/nm-openvpn-fix-pw-tls-entries.patch b/nm-openvpn-fix-pw-tls-entries.patch
deleted file mode 100644
index a8f1bd0..0000000
--- a/nm-openvpn-fix-pw-tls-entries.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
---- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries	2008-09-30 15:59:39.000000000 -0400
-+++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-09-30 16:01:37.000000000 -0400
-@@ -426,7 +426,7 @@
-                               <widget class="GtkLabel" id="label8">
-                                 <property name="visible">True</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" translatable="yes">CA Certificate:</property>
-+                                <property name="label" translatable="yes">User Certificate:</property>
-                               </widget>
-                               <packing>
-                                 <property name="top_attach">1</property>
-@@ -438,7 +438,7 @@
-                               <widget class="GtkLabel" id="label6">
-                                 <property name="visible">True</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" translatable="yes">User Certificate:</property>
-+                                <property name="label" translatable="yes">CA Certificate:</property>
-                               </widget>
-                               <packing>
-                                 <property name="top_attach">2</property>
diff --git a/sources b/sources
index d198046..c53d20a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbf3db7e4e3d14ad2ec1b2689b4bc7a3  NetworkManager-openvpn-0.7.0.svn4027.tar.gz
+027b5577aac9b132fdbd0735eb3ccdeb  NetworkManager-openvpn-0.7.0.svn4326.tar.gz