diff --git a/.gitignore b/.gitignore index 1501446..667332f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /NetworkManager-l2tp-0.9.8.6.tar.gz /NetworkManager-l2tp-0.9.8.7.tar.gz /NetworkManager-l2tp-1.2.0.tar.xz +/NetworkManager-l2tp-1.2.0.tar.gz diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec index 4a69271..a076b01 100644 --- a/NetworkManager-l2tp.spec +++ b/NetworkManager-l2tp.spec @@ -1,31 +1,28 @@ -%global nm_version 1:1.2.0-0.3 -%global gtk3_version 3.0 -%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') -%global shared_mime_version 0.16-3 +%global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for l2tp Name: NetworkManager-l2tp Version: 1.2.0 -Release: 0.3.20151023git3239062%{?dist} -# The most of code uses GPLv2+ license. -# Only vpn-password-dialog has LGPLv2+. -License: GPLv2+ and LGPLv2+ +Release: 1%{?dist} +License: GPLv2+ URL: https://launchpad.net/~seriy-pr/+archive/network-manager-l2tp -Source: https://github.com/seriyps/NetworkManager-l2tp/archive/%{version}/%{name}-%{version}.tar.xz +Source: https://github.com/nm-l2tp/network-manager-l2tp/archive/1.2.0.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: libtool -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} -BuildRequires: NetworkManager-libnm-devel >= %{nm_version} +BuildRequires: gtk3-devel >= 3.0 +BuildRequires: NetworkManager-glib-devel >= 1.2 +BuildRequires: NetworkManager-libnm-devel >= 1.2 BuildRequires: libgnome-keyring-devel BuildRequires: intltool gettext BuildRequires: ppp-devel +BuildRequires: autoconf +BuildRequires: automake Requires: nm-connection-editor Requires: dbus -Requires: NetworkManager >= %{nm_version} -Requires: ppp = %{ppp_version} -Requires: shared-mime-info >= %{shared_mime_version} +Requires: NetworkManager +Requires: ppp = %{ppp_version} +Requires: shared-mime-info >= 0.16-3 Requires: pptp Requires: xl2tpd Requires: libreswan @@ -38,9 +35,11 @@ This package contains software for integrating L2TP VPN support with the NetworkManager and the GNOME desktop. %prep -%setup -q +%setup -q -n network-manager-l2tp-%{version} %build +autoreconf -fi +intltoolize %configure \ --disable-static \ --enable-more-warnings=yes \ @@ -50,11 +49,9 @@ the NetworkManager and the GNOME desktop. make %{?_smp_mflags} %install - make install DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p" rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la - rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.la %find_lang %{name} @@ -69,10 +66,14 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.la %{_libexecdir}/nm-l2tp-auth-dialog %{_libexecdir}/nm-l2tp-service %{_datadir}/gnome-vpn-properties/l2tp -%doc AUTHORS NEWS README +%{_datadir}/appdata/network-manager-l2tp.appdata.xml +%doc AUTHORS NEWS README.md %license COPYING %changelog +* Sat Apr 23 2016 Lubomir Rintel - 1.2.0-1 +- Update to 1.2.0 release + * Wed Feb 03 2016 Fedora Release Engineering - 1.2.0-0.3.20151023git3239062 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index d55d76c..58f44e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f330de1e28e7255377ad59aaa31626e NetworkManager-l2tp-1.2.0.tar.xz +5c78d5a3b04102d8a8b9d3fdda5f9da2 NetworkManager-l2tp-1.2.0.tar.gz