From c2fff112d24e3fa26712435fe9c128ea988a0ed9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 11 Mar 2022 17:56:05 +0100
Subject: [PATCH] Update to 1.8.18 release

---
 .gitignore                  |  1 +
 NetworkManager-openvpn.spec | 37 +++++++++++++++++++++++++------------
 sources                     |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index f086e26..366b6a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2
 /NetworkManager-openvpn-1.8.12.tar.xz
 /NetworkManager-openvpn-1.8.14.tar.xz
 /NetworkManager-openvpn-1.8.16.tar.xz
+/NetworkManager-openvpn-1.8.18.tar.xz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 5cbdafe..00349a6 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -3,22 +3,21 @@
 %else
 %bcond_with    libnm_glib
 %endif
-
-%global real_version     1.8.16
-%global rpm_version      1.8.16
-%global release_version  1
-
-%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
+%if 0%{?fedora} < 36 && 0%{?rhel} < 10
+%bcond_with gtk4
+%else
+%bcond_without gtk4
+%endif
 
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   %{rpm_version}
-Release:   %{release_version}%{?dist}.1
+Version:   1.8.18
+Release:   1%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 
-Source0:   https://download.gnome.org/sources/NetworkManager-openvpn/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz
 #Patch1: 0001-example.patch
 
 
@@ -35,6 +34,10 @@ BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
 BuildRequires: libnm-gtk-devel >= 1.2.0
 %endif
 
+%if %with gtk4
+BuildRequires: libnma-gtk4
+%endif
+
 Requires: dbus
 Requires: NetworkManager >= 1:1.2.0
 Requires: openvpn
@@ -64,7 +67,7 @@ the OpenVPN server with NetworkManager (GNOME files).
 
 
 %prep
-%autosetup -p1 -n "%{name}-%{real_version}"
+%autosetup -p1
 
 
 %build
@@ -73,8 +76,11 @@ if [ ! -f configure ]; then
 fi
 %configure \
         --disable-static \
-%if %without libnm_glib
-        --without-libnm-glib \
+%if %with gtk4
+        --with-gtk4 \
+%endif
+%if %with libnm_glib
+        --with-libnm-glib \
 %endif
         --enable-more-warnings=yes \
         --with-dist-version=%{version}-%{release}
@@ -115,6 +121,10 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
 %{_datadir}/metainfo/network-manager-openvpn.metainfo.xml
 
+%if %with gtk4
+%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-openvpn-editor.so
+%endif
+
 %if %with libnm_glib
 %{_libdir}/NetworkManager/libnm-*-properties.so
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
@@ -122,6 +132,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
 
 %changelog
+* Fri Mar 11 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.8.18-1
+- Update to 1.8.18 release
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.16-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 7cef3aa..1c1d89d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-openvpn-1.8.16.tar.xz) = 970b8a5aa6cbe29bab8c079657921f836d8b12234eaf378e6ead9ededee80b1ee97f315ef1037de49699e3cf9498cc667b60812892b857fbce2782a774d8caaf
+SHA512 (NetworkManager-openvpn-1.8.18.tar.xz) = 4cdbd6e6fc6ae1849b45e18bbad29748ee7a538c753901f871de350f08d861acb24770ec74dfb288136b0307b36e6ca784f51f982ade26babaa60e4a1e2f31fd