From 01d92111612cd8c23f3a8b9abc15af4a169e762a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 4 Jul 2016 10:52:26 +0200
Subject: [PATCH] Update to 1.2.4 release

---
 .gitignore                  |  1 +
 NetworkManager-openvpn.spec | 22 ++++++++++++++++------
 sources                     |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29e2b34..d4cd4ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2
 /NetworkManager-openvpn-1.1.92.tar.xz
 /NetworkManager-openvpn-1.1.93.tar.xz
 /NetworkManager-openvpn-1.2.2.tar.xz
+/NetworkManager-openvpn-1.2.4.tar.xz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 1ee61ef..a58b481 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,7 +1,7 @@
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   1.2.2
+Version:   1.2.4
 Release:   1%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -17,12 +17,10 @@ BuildRequires: libnm-gtk-devel >= 1.2.0
 BuildRequires: libnma-devel >= 1.2.0
 BuildRequires: libsecret-devel
 
-Requires: gtk3
 Requires: dbus
 Requires: NetworkManager >= 1:1.2.0
 Requires: openvpn
 Requires(pre): shadow-utils
-Requires: shared-mime-info
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %global _privatelibs libnm-openvpn-properties[.]so.*
@@ -38,7 +36,8 @@ Summary: NetworkManager VPN plugin for OpenVPN - GNOME files
 Group:   System Environment/Base
 
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: nm-connection-editor
+Requires: gtk3
+Requires: shared-mime-info
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %description -n NetworkManager-openvpn-gnome
@@ -76,22 +75,33 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %find_lang %{name}
 
 %files -f %{name}.lang
+%{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn.so
 %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
 %{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name
 %{_libexecdir}/nm-openvpn-service
-%{_libexecdir}/nm-openvpn-auth-dialog
 %{_libexecdir}/nm-openvpn-service-openvpn-helper
 %doc AUTHORS README ChangeLog
 %license COPYING
 
 %files -n NetworkManager-openvpn-gnome
-%{_libdir}/NetworkManager/lib*.so*
+%{_libexecdir}/nm-openvpn-auth-dialog
+%{_libdir}/NetworkManager/libnm-*-properties.so
+%{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %{_datadir}/appdata/network-manager-openvpn.metainfo.xml
 
 %changelog
+* Mon Jul  4 2016 Thomas Haller <thaller@redhat.com> - 1.2.4-1
+- Update to 1.2.4 release
+- Remove GTK dependency from base openvpn package (rh#1088670)
+- Introduce new GTK-free VPN plugin base-library to openvpn package
+- Don't require nm-connection-editor anymore
+- Fix import of ovpn file with default route (rh#1350108)
+- Extend support for comp-lzo option (rh#1327284)
+- Preserve IP route configuration on restart (rh#1231338)
+
 * Wed May 11 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.2-1
 - Update to 1.2.2 release
 
diff --git a/sources b/sources
index eaf5cc3..62ea748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7889d7530f226afd3ef110501a68af4  NetworkManager-openvpn-1.2.2.tar.xz
+ee4c09a8896eab3e1740f7c7bc1434f9  NetworkManager-openvpn-1.2.4.tar.xz