From fa5d27e9e7622e898ab22ea787b408bc9323c430 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Thu, 3 Jul 2008 02:28:44 +0000
Subject: [PATCH] - Update for moving VPN editing into connection manager -
 Import OpenVPN configuration files rather than old custom format

---
 .cvsignore                  |  1 +
 NetworkManager-openvpn.spec | 16 +++++++++-------
 sources                     |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 049ef57..100d8a4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 NetworkManager-openvpn-0.7.0.svn3302.tar.gz
 NetworkManager-openvpn-0.7.0.svn3549.tar.gz
+NetworkManager-openvpn-0.7.0.svn3801.tar.gz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 6e70db3..e895393 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.9.3.svn3623
+%define nm_version          1:0.7.0-0.10.svn3801
 %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 .svn3632
+%define svn_snapshot .svn3801
 
 Summary: NetworkManager VPN integration for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 10%{svn_snapshot}%{?dist}
+Release: 11%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -18,10 +18,8 @@ Group: System Environment/Base
 # - Check out NetworkManager from Gnome SVN, currently trunk is used
 # - cd NetworkManager/vpn-daemons/openvpn
 # - ./autogen.sh --prefix=/usr --sysconfdir=/etc
-# - make distclean
-# - cd ..
-# - mv openvpn NetworkManager-openvpn-%{version}
-# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version}
+# - make distcheck
+# - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}%{svn_snapshot}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -105,6 +103,10 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Wed Jul 02 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-11.svn3801
+- Update for moving VPN editing into connection manager
+- Import OpenVPN configuration files rather than old custom format
+
 * Mon May 05 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-10.svn3632
 - Fix issue with location of the VPN plugin
 
diff --git a/sources b/sources
index 343a0ba..b1b28cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4266d18d5949091ec85a8214244b787  NetworkManager-openvpn-0.7.0.svn3632.tar.gz
+e1a9424d9dc0188f1a61e48bac9fe01a  NetworkManager-openvpn-0.7.0.svn3801.tar.gz