jklimes pushed to NetworkManager-vpnc (private-jklimes-el6). "--- only for test build --- (..more)"

[notifications at fedoraproject.org]

>From c10aabfb596a59f5f8d466db45236389486649da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes at redhat.com>
Date: Mon, 13 Apr 2015 16:07:17 +0200
Subject: --- only for test build ---

to be able to build it for NM 0.8.1-97 for testing

diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index 7bfb2ad..a7dfc40 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -1,4 +1,4 @@
-%define nm_version          1:0.8.1-97
+%define nm_version          1:0.8.1-75
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.5
@@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch1: fix-build-import-export.patch
 Patch2: rh1069313-VPN-never-default.patch
+Patch3: xxx.patch
 
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -51,6 +52,7 @@ with NetworkManager and the GNOME desktop
 
 %patch1 -p1 -b .fix-build-import-export
 %patch2 -p1 -b .rh1069313-VPN-never-default
+%patch3 -p1 -b .xxx
 
 %build
 autoreconf
diff --git a/xxx.patch b/xxx.patch
new file mode 100644
index 0000000..7a6c4f7
--- /dev/null
+++ b/xxx.patch
@@ -0,0 +1,59 @@
+From 76c54cd744ad6f92b0627f285828bf3dda29dd15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes at redhat.com>
+Date: Mon, 13 Apr 2015 16:05:32 +0200
+Subject: [PATCH] asdasdas
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiří Klimeš <jklimes at redhat.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nm-vpnc-service-vpnc-helper.c b/src/nm-vpnc-service-vpnc-helper.c
+index 65bdea4..247016b 100644
+--- a/src/nm-vpnc-service-vpnc-helper.c
++++ b/src/nm-vpnc-service-vpnc-helper.c
+@@ -275,6 +275,9 @@ get_routes (void)
+ 
+ 	return value;
+ }
++#ifndef NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT
++#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
++#endif
+ 
+ /*
+  * Environment variables passed back from 'vpnc':
+-- 
+2.1.0
+
+From d387aa019410bce52695d09989e03e37831a9b4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes at redhat.com>
+Date: Mon, 13 Apr 2015 16:51:45 +0200
+Subject: [PATCH] yyy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiří Klimeš <jklimes at redhat.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9321916..7f5adac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,7 +98,7 @@ AC_MSG_RESULT($ac_have_recent_vpn_props)
+ if test "$ac_have_recent_vpn_props" = yes; then
+ 	AC_DEFINE(HAVE_RECENT_VPN_PROPS, 1, [Define if you have NM 0.8.6 or later])
+ else
+-	AC_DEFINE(HAVE_RECENT_VPN_PROPS, 0, [Define if you have NM 0.8.6 or later])
++	AC_DEFINE(HAVE_RECENT_VPN_PROPS, 1, [Define if you have NM 0.8.6 or later])
+ fi
+ 
+ PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.8 libnm-util libnm-glib libnm-glib-vpn)
+-- 
+2.1.0
+
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/NetworkManager-vpnc.git/commit/?h=private-jklimes-el6&id=c10aabfb596a59f5f8d466db45236389486649da