From 822a552c619f3ed75e3c40bb3607009c83c5e3d4 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Mon, 18 Apr 2022 11:32:23 +1000
Subject: [PATCH] Updated to 1.20.2 release

Conditional gtk4 support added
---
 .gitignore               |  1 +
 NetworkManager-l2tp.spec | 35 +++++++++++++++++++++++++----------
 sources                  |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95a03d1..7fb4cc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /NetworkManager-l2tp-1.8.2.tar.xz
 /NetworkManager-l2tp-1.8.6.tar.xz
 /NetworkManager-l2tp-1.20.0.tar.xz
+/NetworkManager-l2tp-1.20.2.tar.xz
diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec
index 3442c8e..3a7c633 100644
--- a/NetworkManager-l2tp.spec
+++ b/NetworkManager-l2tp.spec
@@ -1,7 +1,13 @@
+%if 0%{?fedora} < 36 && 0%{?rhel} < 10
+%bcond_with gtk4
+%else
+%bcond_without gtk4
+%endif
+
 Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPsec
 Name:      NetworkManager-l2tp
-Version:   1.20.0
-Release:   2%{?dist}
+Version:   1.20.2
+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
@@ -12,23 +18,22 @@ BuildRequires: make
 BuildRequires: gcc
 BuildRequires: glib2-devel
 BuildRequires: gtk3-devel
-BuildRequires: NetworkManager-libnm-devel >= 1:1.8.0
+BuildRequires: NetworkManager-libnm-devel >= 1:1.20.0
 BuildRequires: libnma-devel >= 1.8.0
 BuildRequires: ppp-devel
 BuildRequires: libtool gettext
 BuildRequires: libsecret-devel
 BuildRequires: openssl-devel >= 1:1.1.0
 BuildRequires: nss-devel
+%if %with gtk4
+BuildRequires: libnma-gtk4-devel
+%endif
 
-Requires: dbus
-Requires: NetworkManager >= 1:1.8.0
+Requires: dbus-common
+Requires: NetworkManager >= 1:1.20.0
 Requires: ppp = %{ppp_version}
 Requires: xl2tpd
-%if 0%{?rhel} == 8
 Recommends: (libreswan or strongswan)
-%else
-Recommends: (libreswan >= 4.0 or strongswan)
-%endif
 
 %global __provides_exclude ^libnm-.*\\.so
 
@@ -53,6 +58,9 @@ if [ ! -f configure ]; then
 fi
 %configure \
     --disable-static \
+%if %with gtk4
+	--with-gtk4 \
+%endif
 %if 0%{?rhel} == 8
     --enable-libreswan-dh2 \
     --with-nm-ipsec-nss-dir=%{_sysconfdir}/ipsec.d \
@@ -99,9 +107,16 @@ exit 0
 %files gnome
 %{_libexecdir}/nm-l2tp-auth-dialog
 %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
-%{_datadir}/metainfo/network-manager-l2tp.metainfo.xml
+%{_metainfodir}/network-manager-l2tp.metainfo.xml
+%if %with gtk4
+%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-l2tp-editor.so
+%endif
 
 %changelog
+* Mon Apr 18 2022 Douglas Kosovic <doug@uq.edu.au> - 1.20.2-1
+- Updated to 1.20.2 release
+- Conditional gtk4 support added
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 551b7cd..c35fe04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-l2tp-1.20.0.tar.xz) = c1a51ea32b5ab23b95710e13715a5280761f487ff37348f92612b082f808a9fbdcd743f91b7626b96a21b4128d18460f87e6e912db5d4d5e3e5f6d7c9434922b
+SHA512 (NetworkManager-l2tp-1.20.2.tar.xz) = b3b73386e1b1f6ec8b42142ace42e9e661f9c1caf83e9b64bbcc0e54aa21b0a5d6c6951842cb829fe22086c5f72771361aecf971f402d78c07ecd59441c52596