diff --git a/.gitignore b/.gitignore index 0184495..061b57e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,9 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.8.6.tar.xz /NetworkManager-openvpn-1.8.8.tar.xz /NetworkManager-openvpn-1.8.10.tar.xz +/NetworkManager-openvpn-1.8.12.tar.xz +/NetworkManager-openvpn-1.8.14.tar.xz +/NetworkManager-openvpn-1.8.16.tar.xz +/NetworkManager-openvpn-1.8.18.tar.xz +/NetworkManager-openvpn-1.10.0.tar.xz +/NetworkManager-openvpn-1.10.2.tar.xz diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 9406376..34977cd 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,37 +1,31 @@ -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%bcond_without libnm_glib +%if 0%{?fedora} < 36 && 0%{?rhel} < 9 +%bcond_with gtk4 %else -%bcond_with libnm_glib +%bcond_without gtk4 %endif -%global real_version 1.8.10 -%global rpm_version 1.8.10 -%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') - Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: %{rpm_version} -Release: %{release_version}%{?dist}.1 +Version: 1.10.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source0: https://download.gnome.org/sources/NetworkManager-openvpn/%{real_version_major}/%{name}-%{real_version}.tar.xz +Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.10/%{name}-%{version}.tar.xz #Patch1: 0001-example.patch +BuildRequires: make BuildRequires: gtk3-devel BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel -BuildRequires: libtool intltool gettext +BuildRequires: libtool gettext BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libsecret-devel -%if %with libnm_glib -BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 -BuildRequires: libnm-gtk-devel >= 1.2.0 +%if %with gtk4 +BuildRequires: libnma-gtk4-devel %endif Requires: dbus @@ -63,7 +57,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep -%autosetup -p1 -n "%{name}-%{real_version}" +%autosetup -p1 %build @@ -72,8 +66,8 @@ if [ ! -f configure ]; then fi %configure \ --disable-static \ -%if %without libnm_glib - --without-libnm-glib \ +%if %with gtk4 + --with-gtk4 \ %endif --enable-more-warnings=yes \ --with-dist-version=%{version}-%{release} @@ -101,26 +95,65 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %files -f %{name}.lang %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn.so -%{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf +%{_datadir}/dbus-1/system.d/nm-openvpn-service.conf %{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service %{_libexecdir}/nm-openvpn-service-openvpn-helper -%doc AUTHORS README ChangeLog +%doc AUTHORS README %license COPYING %files -n NetworkManager-openvpn-gnome %{_libexecdir}/nm-openvpn-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so -%{_datadir}/appdata/network-manager-openvpn.metainfo.xml +%{_datadir}/metainfo/network-manager-openvpn.metainfo.xml -%if %with libnm_glib -%{_libdir}/NetworkManager/libnm-*-properties.so -%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%if %with gtk4 +%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-openvpn-editor.so %endif %changelog +* Tue Nov 15 2022 Lubomir Rintel - 1:1.10.2-1 +- Update to 1.10.2 release + +* Mon Aug 29 2022 Lubomir Rintel - 1:1.10.0-1 +- Update to 1.10.0 release + +* Wed Jul 20 2022 Fedora Release Engineering - 1:1.8.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Mar 11 2022 Lubomir Rintel - 1:1.8.18-1 +- Update to 1.8.18 release + +* Wed Jan 19 2022 Fedora Release Engineering - 1:1.8.16-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 28 2021 Beniamino Galvani - 1:1.8.16-1 +- Update to 1.8.16 release +- Fix detection of OpenVPN 2.5.0 +- Allow the connection to persist across network failures when the VPN + profile has 'vpn.persistent=yes'. +- Fix parsing of incomplete IPv6 configurations pushed by server + +* Wed Jul 21 2021 Fedora Release Engineering - 1:1.8.14-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 30 2021 Beniamino Galvani - 1:1.8.14-1 +- Update to 1.8.14 release + +* Mon Jan 25 2021 Fedora Release Engineering - 1:1.8.12-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1:1.8.12-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Mar 6 2020 Beniamino Galvani - 1:1.8.12-1 +- Update to 1.8.12 release + +* Tue Jan 28 2020 Fedora Release Engineering - 1:1.8.10-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.10-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9ced4be..acfd908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.10.tar.xz) = f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc +SHA512 (NetworkManager-openvpn-1.10.2.tar.xz) = 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a