- updated to 1.2.18, added gtk4 editor module

diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec
index 05a4706ebe12b297fff0aedf2d62a5a1856f54c4..83e41d748e4434c05b632fce90c2185f8e3ee1ac 100644 (file)
--- a/NetworkManager-libreswan.spec
+++ b/NetworkManager-libreswan.spec
@@ -1,23 +1,28 @@
-# TODO: GTK4 for GNOME42 (requires libnma-gtk4 >= 1.8.33)
+#
+# Conditional build:
+%bcond_without gtk4    # Gtk4 version of editor plugin (GNOME 42+)
+
 Summary:       NetworkManager VPN integration for libreswan
 Summary(pl.UTF-8):     Integracja NetworkManagera z sieciami VPN opartymi o libreswan
 Name:          NetworkManager-libreswan
-Version:       1.2.16
+Version:       1.2.18
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
-# Source0-md5: b7b273bc11e2c443d08ebe4de1c1d33b
+# Source0-md5: 5630d2893c06b665b3a93cad1230c73e
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: NetworkManager-devel >= 2:1.2.0
 BuildRequires: NetworkManager-gtk-lib-devel >= 1.2.0
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.32
+BuildRequires: glib2-devel >= 1:2.36
 BuildRequires: gtk+3-devel >= 3.4.0
+%{?with_gtk4:BuildRequires:    gtk4-devel >= 4.0}
 BuildRequires: intltool >= 0.35.0
 BuildRequires: libnl-devel >= 1:3.2.8
+%{?with_gtk4:BuildRequires:    libnma-gtk4-devel >= 1.8.33}
 BuildRequires: libsecret-devel >= 0.18
 BuildRequires: libtool >= 2:2
 BuildRequires: libxml2-devel >= 2.0
@@ -26,7 +31,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: xz
 Requires:      NetworkManager >= 2:1.2.0
 Requires:      NetworkManager-gtk-lib >= 1.2.0
-Requires:      glib2 >= 1:2.32
+Requires:      glib2 >= 1:2.36
 Requires:      gtk+3 >= 3.4.0
 Requires:      libnl >= 1:3.2.8
 Requires:      libsecret >= 0.18
@@ -57,7 +62,8 @@ IKEv1, jest zgodna z serwerami VPN Libreswan oraz Cisco IPsec.
 %{__automake}
 %configure \
        --disable-more-warnings \
-       --disable-static
+       --disable-static \
+       %{?with_gtk4:--with-gtk4}
 %{__make}
 
 %install
@@ -75,9 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f NetworkManager-libreswan.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so
+%if %{with gtk4}
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so
+%endif
 %attr(755,root,root) %{_libexecdir}/nm-libreswan-auth-dialog
 %attr(755,root,root) %{_libexecdir}/nm-libreswan-service
 %attr(755,root,root) %{_libexecdir}/nm-libreswan-service-helper