From bbcc4b4b65ea7b46d6555dceacb834a280620973 Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Fri, 11 Apr 2014 23:29:58 +0600 Subject: [PATCH] use ppp of any version dropped Groups tag --- NetworkManager-l2tp.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec index f987cb6..5c1d420 100644 --- a/NetworkManager-l2tp.spec +++ b/NetworkManager-l2tp.spec @@ -1,17 +1,16 @@ %global nm_version 1:0.9.2 %global dbus_version 1.1 %global gtk3_version 3.0 -%global ppp_version 2.4.5 +%global ppp_version %(rpm -q ppp --queryformat '%{VERSION}') %global shared_mime_version 0.16-3 Summary: NetworkManager VPN plugin for l2tp Name: NetworkManager-l2tp Version: 0.9.8.6 -Release: 1%{?dist} +Release: 2%{?dist} # The most of code uses GPLv2+ license. # Only vpn-password-dialog has LGPLv2+. License: GPLv2+ and LGPLv2+ -Group: System Environment/Base URL: https://launchpad.net/~seriy-pr/+archive/network-manager-l2tp Source: https://github.com/seriyps/NetworkManager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz @@ -40,7 +39,7 @@ Requires: gnome-keyring Requires: xl2tpd Requires: openswan -%filter_provides_in %{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.so +%filter_provides_in %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so %filter_provides_in %{_libdir}/NetworkManager/lib*.so %description @@ -66,8 +65,8 @@ make install DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a -rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.la -rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.a +rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.la +rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.a %find_lang %{name} @@ -83,6 +82,10 @@ rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.a %{_datadir}/gnome-vpn-properties/l2tp %changelog +* Fri Apr 11 2014 Ivan Romanov - 0.9.8.6-2 +- use ppp of any version +- dropped Groups tag + * Thu Feb 27 2014 Ivan Romanov - 0.9.8.6-1 - updated to 0.9.8.6