From f71d75711f2878cb354ca07866d4efe16dd1b9a1 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Nov 20 2016 08:59:16 +0000
Subject: Update to 1.2.4 release


---

diff --git a/.gitignore b/.gitignore
index 447311a..7fe0e8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /NetworkManager-l2tp-1.2.0.tar.xz
 /NetworkManager-l2tp-1.2.0.tar.gz
 /NetworkManager-l2tp-1.2.2.tar.gz
+/NetworkManager-l2tp-1.2.4.tar.gz
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 093e443..3993963 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -1,25 +1,24 @@
-%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}')
-
-Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPSec
+Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
-Version:   1.2.2
+Version:   1.2.4
 Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://github.com/nm-l2tp/network-manager-l2tp
 Source:    https://github.com/nm-l2tp/network-manager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz
 
+%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
 BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
 BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
 BuildRequires: glib2-devel
 BuildRequires: ppp-devel
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: libtool intltool gettext
 BuildRequires: libsecret-devel
-BuildRequires: libnm-gtk-devel >= 0.9
+BuildRequires: libnm-gtk-devel >= 1.2.0
 BuildRequires: libnma-devel >= 1.2.0
+BuildRequires: libsecret-devel
 
 Requires: dbus
 Requires: NetworkManager >= 1:1.2.0
@@ -33,17 +32,15 @@ Requires: libreswan
 
 %description
 This package contains software for integrating L2TP and L2TP over
-IPSec VPN support with the NetworkManager.
+IPsec VPN support with the NetworkManager.
 
 %package gnome
-Summary: NetworkManager VPN plugin for L2TP and L2TP/IPSec - GNOME files
-Requires: NetworkManager-l2tp = %{version}-%{release}
-Requires: nm-connection-editor
-Obsoletes: NetworkManager-l2tp < 1.2.2
+Summary: NetworkManager VPN plugin for L2TP and L2TP/IPsec - GNOME files
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description gnome
 This package contains software for integrating L2TP and L2TP over
-IPSec VPN support with the NetworkManager (GNOME files).
+IPsec VPN support with the NetworkManager (GNOME files).
 
 %prep
 %setup -q -n network-manager-l2tp-%{version}
@@ -52,15 +49,13 @@ IPSec VPN support with the NetworkManager (GNOME files).
 autoreconf -fi
 intltoolize
 %configure \
-    --disable-static \
-    --enable-more-warnings=yes \
-    --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
-    --with-dist-version=%{version}-%{release}
-
+	--disable-static \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+	--with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p"
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
@@ -68,23 +63,31 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 %find_lang %{name}
 
 %files -f %{name}.lang
+%{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp.so
 %{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-l2tp-service.name
 %{_libexecdir}/nm-l2tp-service
-%{_libexecdir}/nm-l2tp-auth-dialog
 %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
-%{_datadir}/appdata/network-manager-l2tp.metainfo.xml
-%doc AUTHORS README.md
+%doc AUTHORS README.md NEWS
 %license COPYING
 
 %files gnome
-%{_libdir}/NetworkManager/lib*.so*
+%{_libexecdir}/nm-l2tp-auth-dialog
+%{_libdir}/NetworkManager/libnm-*-properties.so
+%{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
 %dir %{_datadir}/gnome-vpn-properties/l2tp
 %{_datadir}/gnome-vpn-properties/l2tp/nm-l2tp-dialog.ui
 %{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
 %{_datadir}/appdata/network-manager-l2tp.metainfo.xml
 
 %changelog
+* Sun Nov 20 2016 Douglas Kosovic <doug@uq.edu.au> - 1.2.4-1
+- Update to 1.2.4 release
+- Remove GTK dependency from base package (rh#1088677)
+- Introduce new GTK-free VPN plugin base-library to nm-l2tp package
+- Don't require nm-connection-editor anymore
+- No need for --enable-more-warnings=yes configure switch anymore
+
 * Mon May 16 2016 Douglas Kosovic <doug@uq.edu.au> - 1.2.2-1
 - Updated to 1.2.2 release
 - Added NetworkManager-l2tp-gnome RPM for GNOME files
diff --git a/sources b/sources
index bb2445f..f73335f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77a1f996678060ad33651754980163cd  NetworkManager-l2tp-1.2.2.tar.gz
+7928aa33fde92b66559360d7ee52cb82  NetworkManager-l2tp-1.2.4.tar.gz