[packages/NetworkManager-openconnect] - updated to 1.2.10, added gtk4 editor plugin
qboosh
qboosh at pld-linux.org
Mon May 29 22:01:13 CEST 2023
commit 42aec15c2ddd1bd74ea857cef4dbe8758a29294d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon May 29 22:03:38 2023 +0200
- updated to 1.2.10, added gtk4 editor plugin
NetworkManager-openconnect.spec | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/NetworkManager-openconnect.spec b/NetworkManager-openconnect.spec
index 770590a..0808bad 100644
--- a/NetworkManager-openconnect.spec
+++ b/NetworkManager-openconnect.spec
@@ -1,13 +1,16 @@
-# TODO: GTK4 variant for GNOME42 (--with-gtk4, requires libnma-gtk4 >= 1.8.33)
+#
+# Conditional build:
+%bcond_without gtk4 # Gtk4 version of editor plugin (GNOME 42+)
+
Summary: NetworkManager VPN integration for openconnect
Summary(pl.UTF-8): Integracja NetworkManagera z openconnect
Name: NetworkManager-openconnect
-Version: 1.2.8
+Version: 1.2.10
Release: 1
License: GPL v2+
Group: X11/Applications
Source0: https://download.gnome.org/sources/NetworkManager-openconnect/1.2/%{name}-%{version}.tar.xz
-# Source0-md5: 8c858ae6f4ba6c0c4931d8a707bb40c6
+# Source0-md5: 7d814d8f8cbb024ef96818103b3c8a68
URL: https://wiki.gnome.org/Projects/NetworkManager
BuildRequires: NetworkManager-devel >= 2:1.2.0
BuildRequires: NetworkManager-gtk-lib-devel >= 1.2.0
@@ -17,7 +20,11 @@ BuildRequires: gcr-ui-devel >= 3.4
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.34
BuildRequires: gtk+3-devel >= 3.12
+# with fallback to gtk-webkit4
+BuildRequires: gtk-webkit4.1-devel >= 2.36
+%{?with_gtk4:BuildRequires: gtk4-devel >= 4.0}
BuildRequires: intltool >= 0.35.0
+%{?with_gtk4:BuildRequires: libnma-gtk4-devel >= 1.8.33}
BuildRequires: libsecret-devel >= 0.18
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.0
@@ -50,7 +57,8 @@ Integracja NetworkManagera z openconnect.
%{__autoheader}
%{__automake}
%configure \
- --disable-static
+ --disable-static \
+ %{?with_gtk4:--with-gtk4}
%{__make}
%install
@@ -71,9 +79,12 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openconnect.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openconnect-editor.so
+%if %{with gtk4}
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-openconnect-editor.so
+%endif
%attr(755,root,root) %{_libexecdir}/nm-openconnect-auth-dialog
%attr(755,root,root) %{_libexecdir}/nm-openconnect-service
%attr(755,root,root) %{_libexecdir}/nm-openconnect-service-openconnect-helper
%{_prefix}/lib/NetworkManager/VPN/nm-openconnect-service.name
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-openconnect-service.conf
-%{_datadir}/appdata/network-manager-openconnect.metainfo.xml
+%{_datadir}/dbus-1/system.d/nm-openconnect-service.conf
+%{_datadir}/metainfo/network-manager-openconnect.metainfo.xml
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager-openconnect.git/commitdiff/42aec15c2ddd1bd74ea857cef4dbe8758a29294d
More information about the pld-cvs-commit
mailing list