From 9222bb3bc11afc90a4e09fe33224c4bd49cfd398 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Tue, 3 Nov 2020 21:34:01 +1000
Subject: [PATCH] Updated to 1.8.6 release Remove redundant libnm_glib
 conditionals explictly recommend libreswan >= 4.0 because of change in NSS DB
 location. AppData file now in %{_datadir}/metainfo/ D-Bus policy file now in
 %{_datadir}/dbus-1/system.d/

---
 .gitignore               |  1 +
 NetworkManager-l2tp.spec | 48 +++++++++++++++-------------------------
 sources                  |  2 +-
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00bca54..5212ea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /NetworkManager-l2tp-1.2.16.tar.xz
 /NetworkManager-l2tp-1.8.0.tar.xz
 /NetworkManager-l2tp-1.8.2.tar.xz
+/NetworkManager-l2tp-1.8.6.tar.xz
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 9687979..9eedb13 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -1,13 +1,7 @@
-%if 0%{?fedora} < 28 && 0%{?rhel} < 8
-%bcond_without libnm_glib
-%else
-%bcond_with libnm_glib
-%endif
-
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
-Version:   1.8.2
-Release:   2%{?dist}
+Version:   1.8.6
+Release:   1%{?dist}
 License:   GPLv2+
 URL:       https://github.com/nm-l2tp/NetworkManager-l2tp
 Source:    https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/%{version}/%{name}-%{version}.tar.xz
@@ -16,27 +10,19 @@ Source:    https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/%{ve
 
 BuildRequires: glib2-devel
 BuildRequires: gtk3-devel
-BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
-BuildRequires: libnma-devel >= 1.2.0
+BuildRequires: NetworkManager-libnm-devel >= 1:1.8.0
+BuildRequires: libnma-devel >= 1.8.0
 BuildRequires: ppp-devel
 BuildRequires: libtool intltool gettext
 BuildRequires: libsecret-devel
-%if %with libnm_glib
-BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
-BuildRequires: libnm-gtk-devel >= 1.2.0
-%endif
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 1:1.1.0
 BuildRequires: nss-devel
 
 Requires: dbus
-Requires: NetworkManager >= 1:1.2.0
+Requires: NetworkManager >= 1:1.8.0
 Requires: ppp = %{ppp_version}
 Requires: xl2tpd
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-Requires: libreswan
-%else
-Recommends: (libreswan or strongswan)
-%endif
+Recommends: (libreswan >= 4.0 or strongswan)
 
 %global __provides_exclude ^libnm-.*\\.so
 
@@ -62,8 +48,8 @@ if [ ! -f configure ]; then
 fi
 %configure \
     --disable-static \
-%if %with libnm_glib
-    --with-libnm-glib \
+%if 0%{?rhel} == 8
+    --enable-libreswan-dh2 \
 %endif
     --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
     --with-dist-version=%{version}-%{release}
@@ -93,7 +79,7 @@ exit 0
 
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp.so
-%{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
+%{_datadir}/dbus-1/system.d/nm-l2tp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-l2tp-service.name
 %{_libexecdir}/nm-l2tp-service
 %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
@@ -105,14 +91,16 @@ exit 0
 %files gnome
 %{_libexecdir}/nm-l2tp-auth-dialog
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
-%{_datadir}/appdata/network-manager-l2tp.metainfo.xml
-
-%if %with libnm_glib
-%{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
-%{_libdir}/NetworkManager/libnm-*-properties.so
-%endif
+%{_datadir}/metainfo/network-manager-l2tp.metainfo.xml
 
 %changelog
+* Tue Nov 03 2020 Douglas Kosovic <doug@uq.edu.au> - 1.8.6-1
+- Updated to 1.8.6 release
+- Remove redundant libnm_glib conditionals
+- explictly recommend libreswan >= 4.0 because of change in NSS DB location.
+- AppData file now in %%{_datadir}/metainfo/
+- D-Bus policy file now in %%{_datadir}/dbus-1/system.d/
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 4088c20..ef5d3f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-l2tp-1.8.2.tar.xz) = fc7f4037a4e2d442231f3c72692b7d405f13507625828dc4b975fab3717c7c0daaeaa757ef2ed875f347a87ac4ccaf5a0df1834235d8879f3d1e0d1b450531b8
+SHA512 (NetworkManager-l2tp-1.8.6.tar.xz) = 968e8c9140f800935e57e6a58fb4cc8a92385427b8a070a5106c37f5a9d05cfcc1333fe706dfa5ae79dfdcdde89e4becd7866a4e5f535b32e1edafe7171946a7