diff --git a/.gitignore b/.gitignore index 8c2170f..07f8ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ NetworkManager-openswan-0.8.tar.gz /NetworkManager-libreswan-1.2.10.tar.xz /NetworkManager-libreswan-1.2.12.tar.xz /NetworkManager-libreswan-1.2.14.tar.xz +/NetworkManager-libreswan-1.2.16.tar.xz diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec index 6b9cb14..a99f4fc 100644 --- a/NetworkManager-libreswan.spec +++ b/NetworkManager-libreswan.spec @@ -3,14 +3,19 @@ %else %bcond_with libnm_glib %endif +%if 0%{?fedora} < 36 && 0%{?rhel} < 10 +%bcond_with gtk4 +%else +%bcond_without gtk4 +%endif %global nm_version 1:1.2.0 %global nma_version 1.2.0 Summary: NetworkManager VPN plug-in for IPsec VPN Name: NetworkManager-libreswan -Version: 1.2.14 -Release: 4%{?dist} +Version: 1.2.16 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source0: https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz @@ -32,6 +37,10 @@ BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: libnm-gtk-devel >= %{nma_version} %endif +%if %with gtk4 +BuildRequires: libnma-gtk4-devel +%endif + Requires: NetworkManager >= %{nm_version} Requires: dbus-common Requires: /usr/sbin/ipsec @@ -70,6 +79,9 @@ the libreswan server with NetworkManager (GNOME files). %build %configure \ --disable-static \ +%if %with gtk4 + --with-gtk4 \ +%endif %if %without libnm_glib --without-libnm-glib \ %endif @@ -99,17 +111,22 @@ mv %{buildroot}%{_sysconfdir}/dbus-1 %{buildroot}%{_datadir}/ %files -n NetworkManager-libreswan-gnome %{_libexecdir}/nm-libreswan-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so -%dir %{_datadir}/gnome-vpn-properties/libreswan -%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui -%{_datadir}/appdata/network-manager-libreswan.metainfo.xml +%{_metainfodir}/network-manager-libreswan.metainfo.xml %if %with libnm_glib %{_libdir}/NetworkManager/libnm-*-properties.so %{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name %endif +%if %with gtk4 +%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so +%endif + %changelog +* Fri Mar 11 2022 Lubomir Rintel - 1.2.16-4 +- Update to 1.2.16 release + * Wed Jan 19 2022 Fedora Release Engineering - 1.2.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index ecb255c..d7a2708 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-libreswan-1.2.14.tar.xz) = 4dec676c906ab67151321e29a050805c1c2b927da4f15fd3555f3f78758d416bbdd05a664a0e063089211b458abbf9904e82f230cd32cdc4fd5123a73fbe5742 +SHA512 (NetworkManager-libreswan-1.2.16.tar.xz) = 1e775a525df5ae6dafa2ccc04af345e5cc04d74ea9f532614f4fd2b388c1016940a1db8347ac670fe396f075b5c9234afea59e777ecbd6ce647db9f3247cd7ad