Merge branch 'master' into f24

NetworkManager-libreswan.spec

@@ -1,15 +1,14 @@
-%global snapshot          .rc1
 %global nm_version        1:1.1.0
 %global nma_version       1.1.0
 
 Summary:   NetworkManager VPN plug-in for IPsec VPN
 Name:      NetworkManager-libreswan
 Version:   1.2.0
-Release:   0.4%{?snapshot}%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.1/%{name}-1.1.93.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-1.2.0.tar.xz
 
 BuildRequires: gtk3-devel
 BuildRequires: libnl3-devel
@@ -53,7 +52,7 @@ This package contains software for integrating VPN capabilities with
 the libreswan server with NetworkManager (GNOME files).
 
 %prep
-%setup -q -n %{name}-1.1.93
+%setup -q
 
 %build
 %configure \
@@ -89,9 +88,13 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/gnome-vpn-properties/libreswan
 %{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui
 %{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
+%{_datadir}/appdata/network-manager-libreswan.appdata.xml
 
 
 %changelog
+* Wed Apr 20 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-1
+- Update to 1.2.0 release
+
 * Tue Apr  5 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.4.rc1
 - Update to NetworkManager-libreswan 1.2-rc1
 

sources

@@ -1 +1 @@
-22101e042051244c960ad8390346d598  NetworkManager-libreswan-1.1.93.tar.xz
+02089767820e282ea3aeba496c4aa95b  NetworkManager-libreswan-1.2.0.tar.xz