From b9c70891787be5be28086555cc0f849fafa2156c Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Fri, 2 May 2008 14:19:43 +0000
Subject: [PATCH] - Update for compat with new NM bits

---
 ...Manager-openvpn-0.7.0-name-file-generation.patch | 11 -----------
 NetworkManager-openvpn.spec                         | 13 +++++++------
 sources                                             |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 NetworkManager-openvpn-0.7.0-name-file-generation.patch

diff --git a/NetworkManager-openvpn-0.7.0-name-file-generation.patch b/NetworkManager-openvpn-0.7.0-name-file-generation.patch
deleted file mode 100644
index a9fa05e..0000000
--- a/NetworkManager-openvpn-0.7.0-name-file-generation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am	2008-04-23 12:57:02.000000000 +0200
-+++ Makefile.am 2008-04-23 12:58:15.000000000 +0200
-@@ -25,7 +25,7 @@
- nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
- 	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
- 		-e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
--		-e 's|[@]LIBDIR[@]|$(libdir)|g' \
-+		-e 's|[@]PREFIX[@]|$(prefix)|g' \
- 		< $(srcdir)/nm-openvpn-service.name.in \
- 		> nm-openvpn-service.name
- 
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 93f1a6e..e829e9a 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,10 +1,10 @@
-%define nm_version          1:0.7.0-0.9.1.svn3549
+%define nm_version          1:0.7.0-0.9.3.svn3623
 %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 .svn3549
+%define svn_snapshot .svn3627
 
 Summary: NetworkManager VPN integration for OpenVPN
 Name: NetworkManager-openvpn
@@ -14,7 +14,6 @@ Release: 10%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
-Patch0: NetworkManager-openvpn-0.7.0-name-file-generation.patch
 # How to build the source package:
 # - Check out NetworkManager from Gnome SVN, currently trunk is used
 # - cd NetworkManager/vpn-daemons/openvpn
@@ -27,8 +26,8 @@ Source: %{name}-%{version}%{svn_snapshot}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
-BuildRequires: NetworkManager-devel       >= 1:0.7.0-0.9.1.svn3548
-BuildRequires: NetworkManager-glib-devel  >= 1:0.7.0-0.9.1.svn3548
+BuildRequires: NetworkManager-devel       >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
 BuildRequires: libgnomeui-devel
@@ -57,7 +56,6 @@ with NetworkManager and the GNOME desktop.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -b .namefix
 
 %build
 if [ ! -f configure ]; then
@@ -107,6 +105,9 @@ fi
 %{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Thu May 01 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-10.svn3627
+- Update for compat with new NM bits
+
 * Wed Apr 23 2008 Christoph Höger <choeger@cs.tu-berlin.de> 1:0.7.0-10.svn3549
 - (Hopefully) Fix generation of nm-openvpn-service.name (#443389)
  
diff --git a/sources b/sources
index fd1e0d2..b8d471f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-130eb95562552aa55c73841c78f5de17  NetworkManager-openvpn-0.7.0.svn3549.tar.gz
+84d53172075e20f53908e18a34cc2bb4  NetworkManager-openvpn-0.7.0.svn3627.tar.gz