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

[Daniel Williams]

commit 9a6f294ad9b32d74615feb8cf43bd730b7f22f67
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Oct 24 22:51:15 2011 -0500

    Update to 0.8.5.93 (0.8.6-rc2)

 .gitignore               |    1 +
 NetworkManager-pptp.spec |   19 ++++++++++++-------
 sources                  |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 984c971..19bdd13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ NetworkManager-pptp-0.7.996.git20090921.tar.bz2
 NetworkManager-pptp-0.7.997.tar.bz2
 NetworkManager-pptp-0.8.git20100411.tar.bz2
 NetworkManager-pptp-0.8.1.tar.bz2
+/NetworkManager-pptp-0.8.5.93.tar.bz2
diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index d20c63f..7a5a8a8 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.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 ppp_version         2.4.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 pptp
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   0.8.1
+Version:   0.8.5.93
 Release:   1%{snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -26,7 +26,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
 BuildRequires: ppp-devel = %{ppp_version}
 
@@ -80,7 +79,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
 
 
@@ -89,7 +88,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
 
 
@@ -103,12 +102,18 @@ fi
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
 %{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so
-%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
+%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui
 #%{_datadir}/applications/nm-pptp.desktop
 #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %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)
+- Better handling of VPN server pools where DNS names resolve to multiple IPs
+- Ensure correct UI handling of MPPE options
+- Fix saving secrets for system connections
+
 * Tue Jul 27 2010 Dan Williams <dcbw at redhat.com> - 1:0.8.1-1
 - Update to 0.8.1 release
 - MPPE auth method UI fixes
diff --git a/sources b/sources
index c392416..8a482e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eb00a9c5dc7e50fe76119da914148bc  NetworkManager-pptp-0.8.1.tar.bz2
+9a84079728a8f446af429c32136f05bc  NetworkManager-pptp-0.8.5.93.tar.bz2