Update to 1.2.10 release

- rebase on upstream 1.2.10 release
- import latest translations

.gitignore

@@ -15,3 +15,4 @@ NetworkManager-openswan-0.8.tar.gz
 /NetworkManager-libreswan-1.2.2.tar.xz
 /NetworkManager-libreswan-1.2.4.tar.xz
 /NetworkManager-libreswan-1.2.6.tar.xz
+/NetworkManager-libreswan-1.2.10.tar.xz

NetworkManager-libreswan.spec

@@ -1,23 +1,28 @@
 %if 0%{?fedora} < 28 && 0%{?rhel} < 8
 %bcond_without libnm_glib
 %else
-# Disable the legacy version by default
 %bcond_with libnm_glib
 %endif
 
-%global nm_version        1:1.2.0
+%global real_version     1.2.10
-%global nma_version       1.2.0
+%global rpm_version      1.2.10
+%global release_version  1
+
+%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
+
+%global nm_version       1:1.2.0
+%global nma_version      1.2.0
+
 
 Summary:   NetworkManager VPN plug-in for IPsec VPN
 Name:      NetworkManager-libreswan
-Version:   1.2.6
+Version:   %{rpm_version}
-Release:   2%{?dist}
+Release:   %{release_version}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz
-
+Patch1:    0001-po-import-translations-from-Red-Hat-translators.patch
-Patch1: NetworkManager-libreswan-1.2.6-ikev2.patch
 
 BuildRequires:  gcc
 BuildRequires: gtk3-devel
@@ -44,10 +49,12 @@ Obsoletes: NetworkManager-openswan < %{version}-%{release}
 %global __provides_exclude ^(%{_privatelibs})$
 %global __requires_exclude ^(%{_privatelibs})$
 
+
 %description
 This package contains software for integrating the libreswan VPN software
 with NetworkManager and the GNOME desktop
 
+
 %package -n NetworkManager-libreswan-gnome
 Summary: NetworkManager VPN plugin for libreswan - GNOME files
 Group:   System Environment/Base
@@ -62,9 +69,10 @@ Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release}
 This package contains software for integrating VPN capabilities with
 the libreswan server with NetworkManager (GNOME files).
 
+
 %prep
-%setup -q
+%autosetup -p1 -n "%{name}-%{real_version}"
-%patch1 -p1
+
 
 %build
 %configure \
@@ -76,27 +84,33 @@ the libreswan server with NetworkManager (GNOME files).
         --with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
+
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
 %find_lang %{name}
 
+
 %post
 update-desktop-database &> /dev/null || :
 
+
 %postun
 update-desktop-database &> /dev/null || :
 
+
 %files -f %{name}.lang
 %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
 %{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name
 %{_libexecdir}/nm-libreswan-service
 %{_libexecdir}/nm-libreswan-service-helper
+%{_mandir}/man5/nm-settings-libreswan.5.gz
 %doc AUTHORS ChangeLog NEWS
 %license COPYING
 
+
 %files -n NetworkManager-libreswan-gnome
 %{_libexecdir}/nm-libreswan-auth-dialog
 %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so
@@ -109,7 +123,12 @@ update-desktop-database &> /dev/null || :
 %{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
 %endif
 
+
 %changelog
+* Thu Oct 18 2018 Francesco Giudici <fgiudici@redhat.com> - 1.2.10-1
+- Updated to 1.2.10
+- Import latest translations from upstream
+
 * Wed Aug 22 2018 Paul Wouters <pwouters@redhat.com> - 1.2.6-1
 - Updated to 1.2.6
 - Upstream patches for IKEv2 support

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-libreswan-1.2.6.tar.xz) = 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
+SHA512 (NetworkManager-libreswan-1.2.10.tar.xz) = 90eef90e0ecbe8b8e7b927b49e996b042231ea25495f46b2413dd11a597f170f23668d0a3900f82c84e377dacc15f7589a48b5f28c7d6ee3580b7bbd8f61060d