From 27aa3e03871a24a361844c3c3c3cd94947b337a8 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 4 May 2011 00:01:34 -0500
Subject: [PATCH] Update to 0.8.999 (0.9-rc2)

---
 NetworkManager-pptp.spec | 30 ++++++++++++++++++++----------
 sources                  |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index be09173..91ec005 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -1,17 +1,17 @@
-%define nm_version          1:0.8.1
+%define nm_version          1:0.8.998
 %define dbus_version        1.1
-%define gtk2_version        2.10.0
+%define gtk3_version        3.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.999
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   0.8.1
-Release:   2%{snapshot}%{?dist}
+Version:   0.8.999
+Release:   1%{snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -19,14 +19,12 @@ Source:    %{name}-%{realversion}%{snapshot}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
-BuildRequires: gtk2-devel             >= %{gtk2_version}
+BuildRequires: gtk3-devel             >= %{gtk3_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: dbus-glib-devel        >= 0.74
 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}
 
@@ -36,7 +34,6 @@ Requires: NetworkManager   >= %{nm_version}
 Requires: ppp              = %{ppp_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: pptp
-Requires: GConf2
 Requires: gnome-keyring
 Requires(post):   /sbin/ldconfig desktop-file-utils
 Requires(postun): /sbin/ldconfig desktop-file-utils
@@ -103,12 +100,25 @@ 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}/applications/nm-pptp.desktop
 #%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
 %dir %{_datadir}/gnome-vpn-properties/pptp
+%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui
 
 %changelog
+* Tue May 03 2011 Dan Williams <dcbw@redhat.com> - 1:0.8.999-1
+- Update to 0.8.999 (0.9-rc2)
+- ui: default to user-stored secrets for new connections
+- ui: updated translations
+
+* Tue Apr 05 2011 Dan Williams <dcbw@redhat.com> - 1:0.8.998-1
+- Update to 0.8.998 (0.9.0-rc1)
+- Fix issues with secrets flags and password saving/retrieval
+- Fix issues with PPTP pools using the same DNS name for different servers
+
+* Sat Mar 26 2011 Christopher Aillon <caillon@redhat.com> - 1:0.8.995-1
+- Update to 0.8.995
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c392416..bc0eb28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eb00a9c5dc7e50fe76119da914148bc  NetworkManager-pptp-0.8.1.tar.bz2
+7db30dc1198b0f7453ffc05d24248b55  NetworkManager-pptp-0.8.999.tar.bz2