From b8f6cee323b9f87b1386630321a4ad6e472b14e0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 2 Oct 2018 11:01:17 +0200
Subject: [PATCH] Update to 1.8.6 release

Also, update .spec file with some double-new-lines and
variables for the version (like for network-manager-applet).
---
 .gitignore                  |  1 +
 NetworkManager-openvpn.spec | 31 ++++++++++++++++++++++++-------
 sources                     |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95e7de5..0280c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2
 /NetworkManager-openvpn-1.8.0.tar.xz
 /NetworkManager-openvpn-1.8.2.tar.xz
 /NetworkManager-openvpn-1.8.4.tar.xz
+/NetworkManager-openvpn-1.8.6.tar.xz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 74ab607..e8b6266 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,22 +1,28 @@
 %if 0%{?fedora} < 28 && 0%{?rhel} < 8
 %bcond_without libnm_glib
 %else
-# Disable the legacy version by default
-%bcond_with libnm_glib
+%bcond_with    libnm_glib
 %endif
 
+%global real_version     1.8.6
+%global rpm_version      1.8.6
+%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')
+
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   1.8.4
-Release:   2%{?dist}
+Version:   %{rpm_version}
+Release:   %{release_version}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz
 
+Source0:   https://download.gnome.org/sources/NetworkManager-openvpn/%{real_version_major}/%{name}-%{real_version}.tar.xz
 #Patch1: 0001-example.patch
 
+
 BuildRequires: gtk3-devel
 BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0
 BuildRequires: glib2-devel
@@ -35,12 +41,15 @@ Requires: openvpn
 Requires(pre): shadow-utils
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
+
 %global __provides_exclude ^libnm-.*\\.so
 
+
 %description
 This package contains software for integrating VPN capabilities with
 the OpenVPN server with NetworkManager.
 
+
 %package -n NetworkManager-openvpn-gnome
 Summary: NetworkManager VPN plugin for OpenVPN - GNOME files
 Group:   System Environment/Base
@@ -54,10 +63,10 @@ Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 This package contains software for integrating VPN capabilities with
 the OpenVPN server with NetworkManager (GNOME files).
 
+
 %prep
-%setup -q
+%autosetup -p1 -n "%{name}-%{real_version}"
 
-#%patch1 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -72,9 +81,11 @@ fi
         --with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
+
 %check
 make check
 
+
 %pre
 getent group nm-openvpn >/dev/null || groupadd -r nm-openvpn
 getent passwd nm-openvpn >/dev/null || \
@@ -82,6 +93,7 @@ getent passwd nm-openvpn >/dev/null || \
     -c "Default user for running openvpn spawned by NetworkManager" nm-openvpn
 exit 0
 
+
 %install
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
@@ -98,6 +110,7 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %doc AUTHORS README ChangeLog
 %license COPYING
 
+
 %files -n NetworkManager-openvpn-gnome
 %{_libexecdir}/nm-openvpn-auth-dialog
 %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
@@ -108,7 +121,11 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %endif
 
+
 %changelog
+* Tue Oct  2 2018 Thomas Haller <thaller@redhat.com> - 1:1.8.6-1
+- Update to 1.8.6 release
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 34eb0ec..8f26d3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-openvpn-1.8.4.tar.xz) = dd0381175fa6a88259726a848ac46b7a5ee07a797cbe34382d3f4c0b6d8ad3807d224bfbb53cff793f4854558484d77fc7c6a6970e5364d39d058da5c35eac5a
+SHA512 (NetworkManager-openvpn-1.8.6.tar.xz) = a2d711be58810aad337b9c8bdead1ba6f64c1d1315a772ab79815624794c79668ab5056587be7096ac7367554c16114c2a3805a03484c2ea265ba4cd3bd54d32