diff --git a/.gitignore b/.gitignore index 13bf637..31ca71a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /NetworkManager-fortisslvpn-1.1.92.tar.xz /NetworkManager-fortisslvpn-1.1.93.tar.xz /NetworkManager-fortisslvpn-1.2.2.tar.xz +/NetworkManager-fortisslvpn-1.2.3-dev-66-g52ea308.tar.xz diff --git a/NetworkManager-fortisslvpn.spec b/NetworkManager-fortisslvpn.spec index 0e69f68..c5ae878 100644 --- a/NetworkManager-fortisslvpn.spec +++ b/NetworkManager-fortisslvpn.spec @@ -1,29 +1,29 @@ -%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') - Summary: NetworkManager VPN plugin for Fortinet compatible SSLVPN Name: NetworkManager-fortisslvpn -Version: 1.2.2 -Release: 1%{?dist} +Version: 1.2.4 +Release: 0.1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-fortisslvpn/1.2/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/NetworkManager-fortisslvpn/1.2/%{name}-%{version}.tar.xz +Source0: NetworkManager-fortisslvpn-1.2.3-dev-66-g52ea308.tar.xz + +%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) BuildRequires: gtk3-devel >= 3.4 BuildRequires: dbus-devel >= 0.74 -BuildRequires: NetworkManager-devel >= 1:1.1.0 -BuildRequires: NetworkManager-glib-devel >= 1:1.1.0 -BuildRequires: NetworkManager-libnm-devel >= 1:1.1.0 +BuildRequires: NetworkManager-devel >= 1:1.2.0 +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel >= 2.32 BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel -BuildRequires: libnm-gtk-devel >= 1.0.4 -BuildRequires: libnma-devel >= 1.1.0 +BuildRequires: libnm-gtk-devel >= 1.2.0 +BuildRequires: libnma-devel >= 1.2.0 -Requires: gtk3 Requires: dbus -Requires: NetworkManager >= 1:1.1.0 +Requires: NetworkManager >= 1:1.2.0 Requires: openfortivpn Requires: ppp = %{ppp_version} @@ -42,7 +42,6 @@ Summary: NetworkManager VPN plugin for SSLVPN - GNOME files Group: System Environment/Base Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: nm-connection-editor %description -n NetworkManager-fortisslvpn-gnome This package contains software for integrating VPN capabilities with @@ -50,7 +49,7 @@ the Fortinet compatible SSLVPN server with NetworkManager (GNOME files). %prep -%setup -q +%setup -q -n NetworkManager-fortisslvpn-1.2.3 %build @@ -75,16 +74,19 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %files -f %{name}.lang +%{_libdir}/NetworkManager/libnm-vpn-plugin-fortisslvpn.so %{_sysconfdir}/dbus-1/system.d/nm-fortisslvpn-service.conf %{_prefix}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name %{_libexecdir}/nm-fortisslvpn-service -%{_libexecdir}/nm-fortisslvpn-auth-dialog %{_libdir}/pppd/%{ppp_version}/nm-fortisslvpn-pppd-plugin.so %{_sharedstatedir}/NetworkManager-fortisslvpn %doc AUTHORS README ChangeLog %license COPYING %files -n NetworkManager-fortisslvpn-gnome +%{_libexecdir}/nm-fortisslvpn-auth-dialog +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_libdir}/NetworkManager/libnm-vpn-plugin-fortisslvpn-editor.so %{_sysconfdir}/NetworkManager/VPN/nm-fortisslvpn-service.name %{_libdir}/NetworkManager/lib*.so* %{_datadir}/gnome-vpn-properties/fortisslvpn @@ -92,6 +94,14 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Mon Oct 3 2016 Thomas Haller - 1.2.4-0.1 +- Update to 1.2.4 pre-release +- Remove GTK dependency from base package +- Add new GTK-free VPN core editor plugin to base package +- Don't require nm-connection-editor anymore +- Support NM_VPN_LOG_LEVEL environment variable to control logging +- Support multiple concurrent VPN connections + * Wed May 11 2016 Lubomir Rintel - 1.2.2-1 - Update to 1.2.2 release diff --git a/sources b/sources index 45c6b5c..cd0178c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbf98c77aa69e791505f0c2525270f7f NetworkManager-fortisslvpn-1.2.2.tar.xz +6cab819e85bea30a8959255995cc6d74 NetworkManager-fortisslvpn-1.2.3-dev-66-g52ea308.tar.xz