From 7c44fa37224f0493e392cec9cf81d50282a0f2a7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 12 Sep 2016 15:08:21 +0200
Subject: [PATCH] Update to 1.2.4-0.1 pre-release package

Implement GTK split (rh#1088677)
---
 .gitignore               |  1 +
 NetworkManager-pptp.spec | 27 ++++++++++++++++++---------
 sources                  |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4d80d7..0afa0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ NetworkManager-pptp-0.8.1.tar.bz2
 /NetworkManager-pptp-1.1.92.tar.xz
 /NetworkManager-pptp-1.1.93.tar.xz
 /NetworkManager-pptp-1.2.2.tar.xz
+/NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz
diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index a8a0354..3d1f04d 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -1,14 +1,15 @@
-%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}')
-
 Summary:   NetworkManager VPN plugin for PPTP
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   1.2.2
-Release:   1%{?dist}
+Version:   1.2.4
+Release:   0.1%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz
+#Source0:   https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz
+Source0:   NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz
+
+%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 
 BuildRequires: gtk3-devel
 BuildRequires: NetworkManager-devel
@@ -39,7 +40,6 @@ Summary: NetworkManager VPN plugin for PPTP - GNOME files
 Group:   System Environment/Base
 
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: nm-connection-editor
 Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3
 
 %description -n NetworkManager-pptp-gnome
@@ -47,7 +47,7 @@ This package contains software for integrating VPN capabilities with
 the PPTP server with NetworkManager (GNOME files).
 
 %prep
-%setup -q
+%setup -q -n NetworkManager-pptp-1.2.3
 
 %build
 %configure \
@@ -69,22 +69,31 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 %find_lang %{name}
 
 %files -f %{name}.lang
+%{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so
 %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
-%{_libexecdir}/nm-pptp-auth-dialog
 %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
 %doc AUTHORS README ChangeLog NEWS
 %license COPYING
 
 %files -n NetworkManager-pptp-gnome
-%{_libdir}/NetworkManager/lib*.so*
+%{_libexecdir}/nm-pptp-auth-dialog
+%{_libdir}/NetworkManager/libnm-*-properties.so
+%{_libdir}/NetworkManager/libnm-vpn-plugin-pptp-editor.so
 %dir %{_datadir}/gnome-vpn-properties/pptp
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %{_datadir}/appdata/network-manager-pptp.metainfo.xml
 
 %changelog
+* Mon Sep 12 2016 Thomas Haller <thaller@redhat.com> - 1.2.4-0.1
+- Update to 1.2.4 pre-release
+- Remove GTK dependency from base openvpn package (rh#1088677)
+- Introduce new GTK-free VPN plugin base-library to nm-pptp package
+- Don't require nm-connection-editor anymore
+- Support NM_VPN_LOG_LEVEL environment variable to control logging
+
 * Wed May 11 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.2-1
 - Update to 1.2.2 release
 
diff --git a/sources b/sources
index faf33a6..3e5b14e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1d0021eff80fcf6ad1c445b4fa0451d  NetworkManager-pptp-1.2.2.tar.xz
+a66297ca567d00e3ea17ae0fd3dae955  NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz