Drop libnm-glib for Fedora 28

epel8
Lubomir Rintel 7 years ago
parent 4867c892cf
commit af16c15526

@ -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 Summary: NetworkManager VPN plugin for OpenVPN
Name: NetworkManager-openvpn Name: NetworkManager-openvpn
Epoch: 1 Epoch: 1
Version: 1.8.0 Version: 1.8.0
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
Group: System Environment/Base Group: System Environment/Base
@ -13,22 +20,24 @@ Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libtool intltool gettext BuildRequires: libtool intltool gettext
BuildRequires: libnm-gtk-devel >= 1.2.0
BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libnma-devel >= 1.2.0
BuildRequires: libsecret-devel 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: dbus
Requires: NetworkManager >= 1:1.2.0 Requires: NetworkManager >= 1:1.2.0
Requires: openvpn Requires: openvpn
Requires(pre): shadow-utils Requires(pre): shadow-utils
Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
%global _privatelibs libnm-openvpn-properties[.]so.* %global __provides_exclude ^libnm-.*\\.so
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
%description %description
This package contains software for integrating VPN capabilities with This package contains software for integrating VPN capabilities with
@ -59,6 +68,9 @@ if [ ! -f configure ]; then
fi fi
%configure \ %configure \
--disable-static \ --disable-static \
%if %without libnm_glib
--without-libnm-glib \
%endif
--enable-more-warnings=yes \ --enable-more-warnings=yes \
--with-dist-version=%{version}-%{release} --with-dist-version=%{version}-%{release}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -91,12 +103,18 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
%files -n NetworkManager-openvpn-gnome %files -n NetworkManager-openvpn-gnome
%{_libexecdir}/nm-openvpn-auth-dialog %{_libexecdir}/nm-openvpn-auth-dialog
%{_libdir}/NetworkManager/libnm-*-properties.so
%{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
%{_datadir}/appdata/network-manager-openvpn.metainfo.xml %{_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 %changelog
* Thu Nov 30 2017 Lubomir Rintel <lkundrak@v3.sk> - 1:1.8.0-4
- Drop libnm-glib for Fedora 28
* Wed Sep 27 2017 Thomas Haller <thaller@redhat.com> - 1:1.8.0-3 * Wed Sep 27 2017 Thomas Haller <thaller@redhat.com> - 1:1.8.0-3
- properties: fix validation of static-key in GUI (bgo#788226) - properties: fix validation of static-key in GUI (bgo#788226)

Loading…
Cancel
Save