From cc2eb4d0c44f21a35f7a118a6446df039adc75da Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Sat, 15 Dec 2012 21:39:15 +0600 Subject: [PATCH] - fix F17 dependency error (rh #886773) - added licensies explanations --- NetworkManager-l2tp.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec index 1d89878..5779d04 100644 --- a/NetworkManager-l2tp.spec +++ b/NetworkManager-l2tp.spec @@ -7,7 +7,9 @@ Summary: NetworkManager VPN plugin for l2tp Name: NetworkManager-l2tp Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?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 @@ -23,7 +25,12 @@ BuildRequires: libgnome-keyring-devel BuildRequires: intltool gettext BuildRequires: ppp-devel = %{ppp_version} +# nm-connection-editor was a part of NetworkManager-gnome but since F18 it splits +%if 0%{?fedora} > 17 Requires: nm-connection-editor +%else +Requires: NetworkManager-gnome +%endif Requires: dbus >= %{dbus_version} Requires: NetworkManager >= %{nm_version} Requires: ppp = %{ppp_version} @@ -76,6 +83,10 @@ rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.a %{_datadir}/gnome-vpn-properties/l2tp %changelog +* Sat Dec 15 2012 - 0.9.6-3 +- fix F17 dependency error (rh #886773) +- added licensies explanations + * Mon Nov 26 2012 - 0.9.6-2 - corrected License tag. Added LGPLv2+ - use only %%{buildroot}