[NetworkManager-vpnc/f14] Update 0.8.5.93 (0.8.6-rc2)

[Daniel Williams]

commit 972cf09c78133d5fa98cbf5310c592d3e3d780ca
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Oct 24 22:40:13 2011 -0500

    Update 0.8.5.93 (0.8.6-rc2)

 .gitignore               |    1 +
 NetworkManager-vpnc.spec |   22 +++++++++++++++-------
 sources                  |    2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83c3638..91a16e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ NetworkManager-vpnc-0.7.996.git20090921.tar.bz2
 NetworkManager-vpnc-0.7.997.tar.bz2
 NetworkManager-vpnc-0.8.git20100411.tar.bz2
 NetworkManager-vpnc-0.8.1.tar.bz2
+/NetworkManager-vpnc-0.8.5.93.tar.bz2
diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index ed87e5e..904ff67 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -1,16 +1,16 @@
 %define nm_version          1:0.8.1
 %define dbus_version        1.1
-%define gtk2_version        2.10.0
+%define gtk2_version        2.12.0
 %define vpnc_version        0.5
 %define shared_mime_version 0.16-3
 
 %define snapshot %{nil}
-%define realversion 0.8.1
+%define realversion 0.8.5.93
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.8.1
+Version:   0.8.5.93
 Release:   1%{snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -24,7 +24,6 @@ BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
-BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -69,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
@@ -78,7 +77,7 @@ fi
 /usr/bin/update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
@@ -92,12 +91,21 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_libexecdir}/nm-vpnc-service
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
-%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
+%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
 #%{_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
+* Tue Oct 25 2011 Dan Williams <dcbw at redhat.com> - 1:0.8.5.93-1
+- Update to 0.8.5.93 (0.8.6-rc2)
+- Use a random IKE source port by default
+- Add IKE DH Group option to the UI
+- Fix import of DHGroup parameter from PCF files
+- Support Hybrid XAUTH authentication
+- Don't claim the default route if concentrator sends explicit ones
+- Use the right IP prefix for point-to-point tunnels
+
 * Tue Jul 27 2010 Dan Williams <dcbw at redhat.com> - 1:0.8.1-1
 - Update to 0.8.1 release
 - Updated translations
diff --git a/sources b/sources
index 1660f7b..d999974 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49847666aad2c2f11c649e7595cf8a7c  NetworkManager-vpnc-0.8.1.tar.bz2
+37a30ee58b8010e4fe6a447cd9c37a56  NetworkManager-vpnc-0.8.5.93.tar.bz2