Drop libnm-glib for Fedora 28

epel9
Lubomir Rintel 7 years ago
parent 8058ae1dde
commit 81644deb3c

@ -1,7 +1,14 @@
%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 L2TP and L2TP/IPsec Summary: NetworkManager VPN plugin for L2TP and L2TP/IPsec
Name: NetworkManager-l2tp Name: NetworkManager-l2tp
Version: 1.2.8 Version: 1.2.8
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://github.com/nm-l2tp/network-manager-l2tp URL: https://github.com/nm-l2tp/network-manager-l2tp
Source: https://github.com/nm-l2tp/network-manager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/nm-l2tp/network-manager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz
@ -10,25 +17,27 @@ Source: https://github.com/nm-l2tp/network-manager-l2tp/archive/%{version}/%{
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: NetworkManager-libnm-devel >= 1:1.2.0
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: ppp-devel BuildRequires: ppp-devel
BuildRequires: libtool intltool gettext BuildRequires: libtool intltool gettext
BuildRequires: libsecret-devel BuildRequires: libsecret-devel
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: ppp = %{ppp_version} Requires: ppp = %{ppp_version}
Requires: xl2tpd Requires: xl2tpd
Recommends: libreswan Recommends: libreswan
%global _privatelibs libnm-l2tp-properties[.]so.* %global __provides_exclude ^libnm-.*\\.so
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
%description %description
This package contains software for integrating L2TP and L2TP over This package contains software for integrating L2TP and L2TP over
@ -50,6 +59,9 @@ autoreconf -fi
intltoolize intltoolize
%configure \ %configure \
--disable-static \ --disable-static \
%if %without libnm_glib
--without-libnm-glib \
%endif
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
--with-dist-version=%{version}-%{release} --with-dist-version=%{version}-%{release}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -76,14 +88,20 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
%files gnome %files gnome
%{_libexecdir}/nm-l2tp-auth-dialog %{_libexecdir}/nm-l2tp-auth-dialog
%{_libdir}/NetworkManager/libnm-*-properties.so
%{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so %{_libdir}/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
%dir %{_datadir}/gnome-vpn-properties/l2tp %dir %{_datadir}/gnome-vpn-properties/l2tp
%{_datadir}/gnome-vpn-properties/l2tp/nm-l2tp-dialog.ui %{_datadir}/gnome-vpn-properties/l2tp/nm-l2tp-dialog.ui
%{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
%{_datadir}/appdata/network-manager-l2tp.metainfo.xml %{_datadir}/appdata/network-manager-l2tp.metainfo.xml
%if %with libnm_glib
%{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
%{_libdir}/NetworkManager/libnm-*-properties.so
%endif
%changelog %changelog
* Thu Nov 30 2017 Lubomir Rintel <lkundrak@v3.sk> - 1.2.8-4
- Drop libnm-glib for Fedora 28
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-3 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

Loading…
Cancel
Save