diff --git a/NetworkManager-libreswan-1.2.14.tar.xz b/NetworkManager-libreswan-1.2.14.tar.xz deleted file mode 100644 index 538257de1a75ea189e398c8a48d19e5aa5de8e4e..0000000000000000000000000000000000000000 Binary files a/NetworkManager-libreswan-1.2.14.tar.xz and /dev/null differ diff --git a/NetworkManager-libreswan-1.2.16.tar.xz b/NetworkManager-libreswan-1.2.16.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..002c6594511ad8befb81c6bd2681333965c0d2a5 Binary files /dev/null and b/NetworkManager-libreswan-1.2.16.tar.xz differ diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec index 4989dd438ab7df0ebdf2b9a21a8c7366e4c6cec2..03f04faf4f9125a33a3223a1a896b051d730c155 100644 --- a/NetworkManager-libreswan.spec +++ b/NetworkManager-libreswan.spec @@ -1,21 +1,38 @@ # spec file for NetworkManager-libreswan +%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 +Version: 1.2.16 Release: 1 -Summary: NetworkManager VPN plug-in for IPsec VPN License: GPLv2+ -URL: http://www.gnome.org/projects/NetworkManager - +URL: https://www.gnome.org/projects/NetworkManager/ Source0: https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz -BuildRequires: gcc gtk3-devel libnl3-devel -BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 -BuildRequires: libnma-devel >= 1.2.0 -BuildRequires: libsecret-devel intltool gettext - -Requires: NetworkManager >= 1:1.2.0 -Requires: dbus /usr/sbin/ipsec +BuildRequires: make +BuildRequires: gcc +BuildRequires: gtk3-devel +BuildRequires: libnl3-devel +BuildRequires: NetworkManager-libnm-devel >= %{nm_version} +BuildRequires: libnma-devel >= %{nma_version} +BuildRequires: libsecret-devel +BuildRequires: intltool gettext + +%if %with libnm_glib +BuildRequires: NetworkManager-devel >= %{nm_version} +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 Provides: NetworkManager-openswan = %{version}-%{release} Obsoletes: NetworkManager-openswan < %{version}-%{release} @@ -25,10 +42,11 @@ Obsoletes: NetworkManager-openswan < %{version}-%{release} %global __requires_exclude ^(%{_privatelibs})$ %description -This package provides easy connections to IPsec VPNs using NetworkManager and Libreswan. +This package contains software for integrating the libreswan VPN software +with NetworkManager and the GNOME desktop %package -n NetworkManager-libreswan-gnome -Summary: NetworkManager VPN plugin for libreswan with GNOME files +Summary: NetworkManager VPN plugin for libreswan - GNOME files Requires: %{name}%{?_isa} = %{version}-%{release} Requires: shared-mime-info @@ -37,47 +55,62 @@ Provides: NetworkManager-openswan-gnome = %{version}-%{release} Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release} %description -n NetworkManager-libreswan-gnome -This package provides software for integrating VPN capabilities with +This package contains software for integrating VPN capabilities with the libreswan server with NetworkManager (GNOME files). %prep -%setup -q +%autosetup -p1 %build -%configure --disable-static --without-libnm-glib --enable-more-warnings=yes --with-dist-version=%{version}-%{release} -%{make_build} +%configure \ + --disable-static \ +%if %with gtk4 + --with-gtk4 \ +%endif +%if %without libnm_glib + --without-libnm-glib \ +%endif + --enable-more-warnings=yes \ + --with-dist-version=%{version}-%{release} +make %{?_smp_mflags} + %install -%{make_install} -%delete_la +make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la +mv %{buildroot}%{_sysconfdir}/dbus-1 %{buildroot}%{_datadir}/ %find_lang %{name} -%post -update-desktop-database &> /dev/null || : - -%postun -update-desktop-database &> /dev/null || : - %files -f %{name}.lang %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so +%{_datadir}/dbus-1/system.d/nm-libreswan-service.conf +%{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name %{_libexecdir}/nm-libreswan-service %{_libexecdir}/nm-libreswan-service-helper -%{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name -%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf %{_mandir}/man5/nm-settings-libreswan.5.gz %doc AUTHORS ChangeLog NEWS %license COPYING + %files -n NetworkManager-libreswan-gnome %{_libexecdir}/nm-libreswan-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so +%{_metainfodir}/network-manager-libreswan.metainfo.xml + +%if %with libnm_glib +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name +%endif -%dir %{_datadir}/gnome-vpn-properties/libreswan -%{_datadir}/appdata/network-manager-libreswan.metainfo.xml -%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui +%if %with gtk4 +%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so +%endif %changelog +* Tue Nov 15 2022 hkgy - 1.2.16-1 +- Upgrade to v1.2.16 + * Wed Dec 29 2021 houyingchao - 1.2.14-1 - Upgrade to 1.2.14