From 2bdebca6e2476b74fbba02c763a3d55e7468611e Mon Sep 17 00:00:00 2001
From: Tim Niemueller <timn@fedoraproject.org>
Date: Tue, 30 Oct 2007 22:43:36 +0000
Subject: [PATCH] Update to 0.7.0

---
 .cvsignore                  |  2 +-
 NetworkManager-openvpn.spec | 38 ++++++++++++++++++++++---------------
 sources                     |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4505fcc..58eec19 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-NetworkManager-openvpn-0.3.2.tar.gz
+NetworkManager-openvpn-0.7.0.svn3047.tar.gz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index a7dcc68..ca07186 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,14 +1,17 @@
-%define nm_version          0.6.4
-%define dbus_version        0.61
-%define gtk2_version        2.6.0
+%define nm_version          1:0.7.0-0.4.svn3030
+%define dbus_version        1.0
+%define gtk2_version        2.10.0
 %define openvpn_version     2.1
-%define shared_mime_version 0.17-1
+%define shared_mime_version 0.16-3
+
+%define svn_snapshot svn3047
 
 Summary: NetworkManager VPN integration for OpenVPN
 Name: NetworkManager-openvpn
-Version: 0.3.2
-Release: 7%{?dist}
-License: GPL
+Epoch:   1
+Version: 0.7.0
+Release: 1.%{svn_snapshot}%{?dist}
+License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
 # How to build the source package:
@@ -20,11 +23,12 @@ Group: System Environment/Base
 # - cd ..
 # - mv openvpn NetworkManager-openvpn-%{version}
 # - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version}
-Source: %{name}-%{version}.tar.gz
+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   >= %{nm_version}
+BuildRequires: gtk2-devel                 >= %{gtk2_version}
+BuildRequires: dbus-devel                 >= %{dbus_version}
+BuildRequires: NetworkManager-devel       >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
@@ -54,7 +58,7 @@ with NetworkManager and the GNOME desktop.
 
 %build
 if [ ! -f configure ]; then
-	./autogen.sh
+  ./autogen.sh
 fi
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
@@ -85,18 +89,22 @@ fi
 %files
 %defattr(-, root, root)
 
-%doc COPYING AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog README
 %{_libdir}/lib*.so*
 %{_libexecdir}/nm-openvpn-auth-dialog
-%config %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
-%config %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
+%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %{_bindir}/nm-openvpn-service
 %{_bindir}/nm-openvpn-service-openvpn-helper
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
 %{_datadir}/applications/nm-openvpn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
+%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Tue Oct 30 2007 Tim Niemueller <tim@niemueller.de> 1:0.7.0-1.svn3047.fc8
+- Upgrade to trunk, needed to be compatible with NM 0.7.0, rebuild for F-8
+
 * Fri Sep 15 2006 Tim Niemueller <tim@niemueller.de> 0.3.2-7
 - Rebuild for FC6
 
diff --git a/sources b/sources
index 741a6a4..2b25ebd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a35d23c554dd215deee39a2e58e8e08  NetworkManager-openvpn-0.3.2.tar.gz
+6cc65cd5e4b4afda8be5412d8dc3534b  NetworkManager-openvpn-0.7.0.svn3047.tar.gz