diff --git a/.gitignore b/.gitignore index 8c2170f..4c00b0f 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.18.tar.xz diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec index da36dd5..f6d7170 100644 --- a/NetworkManager-libreswan.spec +++ b/NetworkManager-libreswan.spec @@ -3,9 +3,14 @@ %else %bcond_with libnm_glib %endif +%if 0%{?fedora} < 36 && 0%{?rhel} < 10 +%bcond_with gtk4 +%else +%bcond_without gtk4 +%endif -%global real_version 1.2.14 -%global rpm_version 1.2.14 +%global real_version 1.2.18 +%global rpm_version 1.2.18 %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') @@ -17,7 +22,7 @@ Summary: NetworkManager VPN plug-in for IPsec VPN Name: NetworkManager-libreswan Version: %{rpm_version} -Release: %{release_version}%{?dist}.3 +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source0: https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz @@ -39,6 +44,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 Requires: /usr/sbin/ipsec @@ -77,6 +86,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 @@ -98,24 +110,28 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_libexecdir}/nm-libreswan-service %{_libexecdir}/nm-libreswan-service-helper %{_mandir}/man5/nm-settings-libreswan.5.gz -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS %license COPYING %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 Dec 15 2023 Fernando Fernandez Mancera - 1.2.18-1 +- Update to 1.2.18 release + * Mon Aug 09 2021 Mohan Boddu - 1.2.14-1.3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index ecb255c..aebdc3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-libreswan-1.2.14.tar.xz) = 4dec676c906ab67151321e29a050805c1c2b927da4f15fd3555f3f78758d416bbdd05a664a0e063089211b458abbf9904e82f230cd32cdc4fd5123a73fbe5742 +SHA512 (NetworkManager-libreswan-1.2.18.tar.xz) = 399724d2c97e976dbd2ec33bb9100ad79aaa66b753b2f8e59b8a5695bfbd9d76273896115bc09efae159d9fb81ed656411562f3321c1696006da0dbd3dc933bd