[NetworkManager-vpnc/f20] Fix path to connection-editor plugin in service file

[thaller]

commit 79361063c250b3e802dd14166e44848407734666
Author: Thomas Haller <thaller at redhat.com>
Date:   Fri Jul 25 20:36:07 2014 +0200

    Fix path to connection-editor plugin in service file

 0001-fix-path.patch      |   52 ++++++++++++++++++++++++++++++++++++++++++++++
 NetworkManager-vpnc.spec |    9 ++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/0001-fix-path.patch b/0001-fix-path.patch
new file mode 100644
index 0000000..67bbf6a
--- /dev/null
+++ b/0001-fix-path.patch
@@ -0,0 +1,52 @@
+From 1f708fff001f97f9c3ea131ea4844aa525830c66 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw at gnome.org>
+Date: Mon, 10 Jun 2013 13:24:26 -0300
+Subject: [PATCH 1/1] Fix path to connection-editor plugin in service file
+
+(cherry picked from commit 4f0ec29795603f4c3cca142d1d179265f89cc2c7)
+---
+ Makefile.am             | 2 +-
+ Makefile.in             | 2 +-
+ nm-vpnc-service.name.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4f46126..e3d9ea5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,7 +28,7 @@ endif
+ 
+ nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
+ 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+-	    -e 's|[@]LIBDIR[@]|$(libdir)|g' \
++	    -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
+ 	    $< >$@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+diff --git a/Makefile.in b/Makefile.in
+index 241577e..c39baa1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -937,7 +937,7 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-iconDATA \
+ 
+ nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
+ 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+-	    -e 's|[@]LIBDIR[@]|$(libdir)|g' \
++	    -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
+ 	    $< >$@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff --git a/nm-vpnc-service.name.in b/nm-vpnc-service.name.in
+index 31f929e..ad40005 100644
+--- a/nm-vpnc-service.name.in
++++ b/nm-vpnc-service.name.in
+@@ -5,5 +5,5 @@ program=@LIBEXECDIR@/nm-vpnc-service
+ 
+ [GNOME]
+ auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog
+-properties=@LIBDIR@/libnm-vpnc-properties
++properties=@PLUGINDIR@/libnm-vpnc-properties
+ supports-external-ui-mode=true
+-- 
+1.9.3
+
diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index a1ed26e..78a1c98 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -4,11 +4,12 @@ Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.9.8.2
-Release:   2%{snapshot}%{?dist}
+Release:   3%{snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.xz
+Patch1:    0001-fix-path.patch
 
 BuildRequires: gtk3-devel
 BuildRequires: dbus-devel
@@ -51,6 +52,7 @@ the vpnc server with NetworkManager (GNOME files).
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .0001-fix-path.orig
 
 
 %build
@@ -102,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
 
 %changelog
+* Fri Jul 25 2014 Thomas Haller <thaller at redhat.com> - 1:0.9.8.2-3
+- Fix path to connection-editor plugin in service file
+
 * Fri Jul 26 2013 Jiří Klimeš <jklimes at redhat.com> - 1:0.9.8.2-2
 - Fixing Obsoletes to ensure NetworkManager-vpnc-gnome installs on update (rh #983632)
 
@@ -301,7 +306,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed Oct 10 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.2.svn2970
 - Fix default username
 
-* Thu Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2914
+* Fri Sep 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.1.svn2914
 - Fix .name file on 64-bit systems
 
 * Fri Sep 28 2007 Jesse Keating <jkeating at redhat.com> - 1:0.7.0-0.2.svn2910