diff --git a/NetworkManager-fortisslvpn.spec b/NetworkManager-fortisslvpn.spec index 48833e1..e57a3ff 100644 --- a/NetworkManager-fortisslvpn.spec +++ b/NetworkManager-fortisslvpn.spec @@ -1,7 +1,14 @@ +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%bcond_with libnm_glib +%else +# Disable the legacy version by default +%bcond_without libnm_glib +%endif + Summary: NetworkManager VPN plugin for Fortinet compatible SSLVPN Name: NetworkManager-fortisslvpn Version: 1.2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -14,23 +21,24 @@ Patch1: 0001-build-fix-building-pppd-plugin.patch BuildRequires: gtk3-devel >= 3.4 BuildRequires: dbus-devel >= 0.74 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.2.0 BuildRequires: libnma-devel >= 1.2.0 +%if %with libnm_glib +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: libnm-gtk-devel >= 1.2.0 +%endif + Requires: dbus Requires: NetworkManager >= 1:1.2.0 Requires: openfortivpn Requires: ppp = %{ppp_version} -%global _privatelibs libnm-fortisslvpn-properties[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude ^libnm-.*\\.so %description @@ -57,6 +65,9 @@ the Fortinet compatible SSLVPN server with NetworkManager (GNOME files). %build %configure \ --disable-static \ +%if %without libnm_glib + --without-libnm-glib \ +%endif --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --with-dist-version=%{version}-%{release} make %{?_smp_mflags} @@ -91,14 +102,20 @@ mkdir %{buildroot}%{_sharedstatedir}/NetworkManager-fortisslvpn %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}/appdata/network-manager-fortisslvpn.metainfo.xml +%if %with libnm_glib +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_sysconfdir}/NetworkManager/VPN/nm-fortisslvpn-service.name +%endif + %changelog +* Thu Nov 30 2017 Lubomir Rintel - 1.2.6-4 +- Drop libnm-glib for Fedora 28 + * Wed Nov 15 2017 Thomas Haller - 1.2.6-3 - Fix broken plugin due to invalid linking of pppd plugin (rh #1512606) (2)