From 88c370a570b4c5dc8554b48e7b4731bfd0183a18 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 31 Aug 2015 15:38:52 +0200
Subject: [PATCH] Update to 1.2 git snapshot with libnm-based properties plugin

---
 .gitignore                  |  1 +
 NetworkManager-openvpn.spec | 35 +++++++++++++++++------------------
 sources                     |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c19bc3..cd5f332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2
 /NetworkManager-openvpn-1.0.0.tar.xz
 /NetworkManager-openvpn-1.0.2.tar.xz
 /NetworkManager-openvpn-1.0.6.tar.xz
+/NetworkManager-openvpn-1.2.0.tar.xz
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 26e34ac..608d4c8 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,23 +1,22 @@
-#global commit %{nil}
-#global snapshot %{nil}%{commit}
+%global snapshot .20150903gitda388ff
 
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   1.0.6
-Release:   3%{?snapshot}%{?dist}
+Version:   1.2.0
+Release:   0.1%{?snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz
 
 BuildRequires: gtk3-devel
-BuildRequires: dbus-devel
 BuildRequires: NetworkManager-devel
-BuildRequires: NetworkManager-glib-devel
+BuildRequires: NetworkManager-glib-devel >= 1:1.1.0
 BuildRequires: glib2-devel
 BuildRequires: libtool intltool gettext
-BuildRequires: libnm-gtk-devel >= 1.0.5
+BuildRequires: libnm-gtk-devel >= 0.9.9.0
+BuildRequires: libnma-devel >= 1.1.0
 BuildRequires: libsecret-devel
 
 Requires: gtk3
@@ -26,6 +25,7 @@ Requires: NetworkManager
 Requires: openvpn
 Requires(pre): shadow-utils
 Requires: shared-mime-info
+Requires(pre): shadow-utils
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %global _privatelibs libnm-openvpn-properties[.]so.*
@@ -40,12 +40,8 @@ the OpenVPN server with NetworkManager.
 Summary: NetworkManager VPN plugin for OpenVPN - GNOME files
 Group:   System Environment/Base
 
-Requires: NetworkManager-openvpn = %{epoch}:%{version}-%{release}
-%if 0%{?fedora} > 17
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: nm-connection-editor
-%else
-Requires: NetworkManager-gnome
-%endif
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %description -n NetworkManager-openvpn-gnome
@@ -61,9 +57,8 @@ if [ ! -f configure ]; then
 fi
 %configure \
         --disable-static \
-        --disable-dependency-tracking \
         --enable-more-warnings=yes \
-        --with-gnome
+        --with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
 %check
@@ -84,20 +79,24 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %find_lang %{name}
 
 %files -f %{name}.lang
-%doc COPYING AUTHORS README ChangeLog
 %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
+%{_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
-%doc COPYING AUTHORS README ChangeLog
 %{_libdir}/NetworkManager/lib*.so*
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui
+%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 
 %changelog
+* Mon Aug 31 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-0.1.20160831gitda388ff
+- Update to 1.2 git snapshot with libnm-based properties plugin
+
 * Fri Aug 28 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-3
 - Create an user for unprivileged runs
 
diff --git a/sources b/sources
index 71ac574..a910db1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02931c0302310d06e43d413b5a7a3261  NetworkManager-openvpn-1.0.6.tar.xz
+9198db992c0cf016d1fa5e65924f7ea2  NetworkManager-openvpn-1.2.0.tar.xz