From af16c1552615a73c6cd8d732c88f52260b56e837 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 30 Nov 2017 10:57:43 +0100 Subject: [PATCH] Drop libnm-glib for Fedora 28 --- NetworkManager-openvpn.spec | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 0156f2b..6dfb100 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,8 +1,15 @@ +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%bcond_without libnm_glib +%else +# Disable the legacy version by default +%bcond_with libnm_glib +%endif + Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -13,22 +20,24 @@ Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 +BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 BuildRequires: glib2-devel BuildRequires: libtool intltool gettext -BuildRequires: libnm-gtk-devel >= 1.2.0 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 +%endif + Requires: dbus Requires: NetworkManager >= 1:1.2.0 Requires: openvpn Requires(pre): shadow-utils Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 -%global _privatelibs libnm-openvpn-properties[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude ^libnm-.*\\.so %description This package contains software for integrating VPN capabilities with @@ -59,6 +68,9 @@ if [ ! -f configure ]; then fi %configure \ --disable-static \ +%if %without libnm_glib + --without-libnm-glib \ +%endif --enable-more-warnings=yes \ --with-dist-version=%{version}-%{release} make %{?_smp_mflags} @@ -91,12 +103,18 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %files -n NetworkManager-openvpn-gnome %{_libexecdir}/nm-openvpn-auth-dialog -%{_libdir}/NetworkManager/libnm-*-properties.so %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so -%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_datadir}/appdata/network-manager-openvpn.metainfo.xml +%if %with libnm_glib +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name +%endif + %changelog +* Thu Nov 30 2017 Lubomir Rintel - 1:1.8.0-4 +- Drop libnm-glib for Fedora 28 + * Wed Sep 27 2017 Thomas Haller - 1:1.8.0-3 - properties: fix validation of static-key in GUI (bgo#788226)