From 89cea68ce4f948b950eb3ed09d40c317a11ec692 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Apr 12 2010 06:15:26 +0000
Subject: - Handle NAT Traversal importing better

- Default to newer NAT-T instead of deprecated Cisco-UDP
- Add "Force NAT-T" option
- Updated translations

---

diff --git a/.cvsignore b/.cvsignore
index 2bfc4d5..35bf6d6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -26,3 +26,4 @@ NetworkManager-vpnc-0.7.0.99.tar.gz
 NetworkManager-vpnc-0.7.996.git20090828.tar.bz2
 NetworkManager-vpnc-0.7.996.git20090921.tar.bz2
 NetworkManager-vpnc-0.7.997.tar.bz2
+NetworkManager-vpnc-0.8.git20100411.tar.bz2
diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index 300f26e..03c43a4 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -4,17 +4,18 @@
 %define vpnc_version        0.5
 %define shared_mime_version 0.16-3
 
-%define git_snapshot %{nil}
+%define snapshot .git20100411
+%define realversion 0.8
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.7.997
-Release:   1%{git_snapshot}%{?dist}
+Version:   0.8.0
+Release:   1%{snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source:    %{name}-%{version}%{git_snapshot}.tar.bz2
+Source:    %{name}-%{realversion}%{snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -42,7 +43,7 @@ This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
-%setup -q
+%setup -q -n NetworkManager-vpnc-%{realversion}
 
 
 %build
@@ -92,11 +93,17 @@ fi
 %{_libexecdir}/nm-vpnc-service
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
-%{_datadir}/applications/nm-vpnc.desktop
+#%{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sun Apr 11 2010 Dan Williams <dcbw@redhat.com> - 1:0.8.0-1
+- Handle NAT Traversal importing better
+- Default to newer NAT-T instead of deprecated Cisco-UDP
+- Add "Force NAT-T" option
+- Updated translations
+
 * Mon Dec 14 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.997-1
 - Add some debug options (VPNC_DEBUG, --persist)
 - Make .desktop file pass validation (rh #489475)
diff --git a/sources b/sources
index d2b9b69..fc718e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa7fae637c75607a87d8e370cd8ef9d1  NetworkManager-vpnc-0.7.997.tar.bz2
+f4ebfb06f22d522fe821d8c0f8eaa857  NetworkManager-vpnc-0.8.git20100411.tar.bz2