Updated to 1.2.2 release

- Added NetworkManager-l2tp-gnome RPM for GNOME files
- Updated BuildRequires, Requires, URL and Source
- Replaced filter_provides macro with newer macros

[lkundrak@v3.sk: returned the autoconf dependencies,
used shorter syntax for subpackage, dropped redundant libsecret
req and doc files in -gnome subpackage]

.gitignore

@@ -5,3 +5,4 @@
 /NetworkManager-l2tp-0.9.8.7.tar.gz
 /NetworkManager-l2tp-1.2.0.tar.xz
 /NetworkManager-l2tp-1.2.0.tar.gz
+/NetworkManager-l2tp-1.2.2.tar.gz

NetworkManager-l2tp.spec

@@ -1,40 +1,49 @@
 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}')
 
-Summary:   NetworkManager VPN plugin for l2tp
+Summary:   NetworkManager VPN plugin for L2TP and L2TP/IPSec
 Name:      NetworkManager-l2tp
-Version:   1.2.0
+Version:   1.2.2
 Release:   1%{?dist}
 License:   GPLv2+
-URL:       https://launchpad.net/~seriy-pr/+archive/network-manager-l2tp
-Source:    https://github.com/nm-l2tp/network-manager-l2tp/archive/1.2.0.tar.gz#/%{name}-%{version}.tar.gz
-
-BuildRequires: libtool
-BuildRequires: gtk3-devel >= 3.0
-BuildRequires: NetworkManager-glib-devel >= 1.2
-BuildRequires: NetworkManager-libnm-devel >= 1.2
-BuildRequires: libnm-gtk-devel >= 1.0
-BuildRequires: libnma-devel >= 1.2
-BuildRequires: libsecret-devel
-BuildRequires: intltool gettext
+URL:       https://github.com/nm-l2tp/network-manager-l2tp
+Source:    https://github.com/nm-l2tp/network-manager-l2tp/archive/%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires: gtk3-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel >= 1:1.2.0
+BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
+BuildRequires: glib2-devel
 BuildRequires: ppp-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libtool intltool gettext
+BuildRequires: libsecret-devel
+BuildRequires: libnm-gtk-devel >= 0.9
+BuildRequires: libnma-devel >= 1.2.0
 
-Requires: nm-connection-editor
 Requires: dbus
-Requires: NetworkManager
+Requires: NetworkManager >= 1:1.2.0
 Requires: ppp = %{ppp_version}
-Requires: shared-mime-info >= 0.16-3
-Requires: pptp
 Requires: xl2tpd
 Requires: libreswan
 
-%filter_provides_in %{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
-%filter_provides_in %{_libdir}/NetworkManager/lib*.so
+%global _privatelibs libnm-l2tp-properties[.]so.*
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
 
 %description
-This package contains software for integrating L2TP VPN support with
-the NetworkManager and the GNOME desktop.
+This package contains software for integrating L2TP and L2TP over
+IPSec VPN support with the NetworkManager.
+
+%package gnome
+Summary: NetworkManager VPN plugin for L2TP and L2TP/IPSec - GNOME files
+Requires: NetworkManager-l2tp = %{version}-%{release}
+Requires: nm-connection-editor
+Obsoletes: NetworkManager-l2tp < 1.2.2
+
+%description gnome
+This package contains software for integrating L2TP and L2TP over
+IPSec VPN support with the NetworkManager (GNOME files).
 
 %prep
 %setup -q -n network-manager-l2tp-%{version}
@@ -54,25 +63,34 @@ make %{?_smp_mflags}
 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
+rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 
 %find_lang %{name}
 
 %files -f %{name}.lang
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
-# Content must not be changed
-%config %{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
+%{_sysconfdir}/dbus-1/system.d/nm-l2tp-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-l2tp-service.name
-%{_libdir}/NetworkManager/lib*.so
-%{_libdir}/pppd/2.*/nm-l2tp-pppd-plugin.so
-%{_libexecdir}/nm-l2tp-auth-dialog
 %{_libexecdir}/nm-l2tp-service
-%{_datadir}/gnome-vpn-properties/l2tp
-%{_datadir}/appdata/network-manager-l2tp.appdata.xml
-%doc AUTHORS NEWS README.md
+%{_libexecdir}/nm-l2tp-auth-dialog
+%{_libdir}/pppd/%{ppp_version}/nm-l2tp-pppd-plugin.so
+%{_datadir}/appdata/network-manager-l2tp.metainfo.xml
+%doc AUTHORS README.md
 %license COPYING
 
+%files gnome
+%{_libdir}/NetworkManager/lib*.so*
+%dir %{_datadir}/gnome-vpn-properties/l2tp
+%{_datadir}/gnome-vpn-properties/l2tp/nm-l2tp-dialog.ui
+%{_sysconfdir}/NetworkManager/VPN/nm-l2tp-service.name
+%{_datadir}/appdata/network-manager-l2tp.metainfo.xml
+
 %changelog
+* Mon May 16 2016 Douglas Kosovic <doug@uq.edu.au> - 1.2.2-1
+- Updated to 1.2.2 release
+- Added NetworkManager-l2tp-gnome RPM for GNOME files
+- Updated BuildRequires, Requires, URL and Source
+- Replaced filter_provides macro with newer macros
+
 * Sat Apr 23 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-1
 - Update to 1.2.0 release
 

sources

@@ -1 +1 @@
-5c78d5a3b04102d8a8b9d3fdda5f9da2  NetworkManager-l2tp-1.2.0.tar.gz
+77a1f996678060ad33651754980163cd  NetworkManager-l2tp-1.2.2.tar.gz