dcbw pushed to NetworkManager-openvpn (epel7). "Re-autogen to ensure makefiles get updated with max-allowed changes"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 16:30:09 UTC 2015


>From 1dff8fd8560f4f6af517618a4587010faca83a42 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Tue, 14 Apr 2015 11:30:44 -0500
Subject: Re-autogen to ensure makefiles get updated with max-allowed changes


diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 88687d4..be63f0d 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -17,6 +17,7 @@ Group:     System Environment/Base
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz
 
 Patch0:    0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch
+Patch1:    nm-max-allowed.patch
 
 BuildRequires: gtk3-devel
 BuildRequires: dbus-devel
@@ -61,11 +62,13 @@ the OpenVPN server with NetworkManager (GNOME files).
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
+autoreconf -i
 %configure \
         --disable-static \
         --disable-dependency-tracking \
diff --git a/nm-max-allowed.patch b/nm-max-allowed.patch
new file mode 100644
index 0000000..efd66cc
--- /dev/null
+++ b/nm-max-allowed.patch
@@ -0,0 +1,12 @@
+diff -up NetworkManager-openvpn-1.0.0/configure.ac.foo NetworkManager-openvpn-1.0.0/configure.ac
+--- NetworkManager-openvpn-1.0.0/configure.ac.foo	2015-04-08 10:18:31.993032447 -0500
++++ NetworkManager-openvpn-1.0.0/configure.ac	2015-04-08 10:18:49.078818846 -0500
+@@ -71,7 +71,7 @@ PKG_CHECK_MODULES(NM,
+ 	libnm-util >= 0.9.10
+ 	libnm-glib >= 0.9.10
+ 	libnm-glib-vpn >= 0.9.10)
+-NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10"
++NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_0_99"
+ AC_SUBST(NM_CFLAGS)
+ AC_SUBST(NM_LIBS)
+ 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/NetworkManager-openvpn.git/commit/?h=epel7&id=1dff8fd8560f4f6af517618a4587010faca83a42


More information about the scm-commits mailing list