[packages/heartbeat] - added tipc patch (use <linux/tipc.h> instead of <net/tipc/tipc.h>)

[qboosh]

commit f52968a55a9ea30e83fd82604c16e108ffd9c9a0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 20 08:39:01 2015 +0100

    - added tipc patch (use <linux/tipc.h> instead of <net/tipc/tipc.h>)

 heartbeat-tipc.patch | 26 ++++++++++++++++++++++++++
 heartbeat.spec       |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/heartbeat.spec b/heartbeat.spec
index 5aed845..98a0f72 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -1,5 +1,4 @@
 # TODO
-# - tipc?
 # - merge mibs subpackage from 2.1 branch
 # - cleanup deps, users for 3.x
 # - fixup deps, inner deps, think of subpackages, ugprade path from 2.1
@@ -19,6 +18,7 @@ Source1:	%{name}.init
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-libs.patch
 Patch2:		%{name}-tls.patch
+Patch3:		%{name}-tipc.patch
 URL:		http://www.linux-ha.org/Heartbeat
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -133,6 +133,7 @@ Zestaw testów klastra opartego o heartbeat.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize} --ltdl
diff --git a/heartbeat-tipc.patch b/heartbeat-tipc.patch
new file mode 100644
index 0000000..77bd594
--- /dev/null
+++ b/heartbeat-tipc.patch
@@ -0,0 +1,26 @@
+--- Heartbeat-3-0-STABLE-3.0.6/configure.ac.orig	2015-12-19 22:17:30.801442381 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/configure.ac	2015-12-20 08:24:22.066581009 +0100
+@@ -1086,7 +1086,9 @@
+         TIPC_INCLUDE="-I${TIPC_HEADER_DIR}"
+ else
+         dnl checking tipc.h in standard include directory
++	AC_CHECK_HEADERS(linux/tipc.h, [], [
+         AC_CHECK_HEADERS(net/tipc/tipc.h, [], [tipc_headers_found=no])
++	])
+ fi
+ 
+ AC_SUBST(TIPC_INCLUDE)
+--- Heartbeat-3-0-STABLE-3.0.6/lib/plugins/HBcomm/tipc.c.orig	2015-02-04 15:57:04.000000000 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/lib/plugins/HBcomm/tipc.c	2015-12-20 08:26:15.429909588 +0100
+@@ -44,7 +44,11 @@
+ #include <heartbeat.h>
+ #include <HBcomm.h>
+ 
++#ifdef HAVE_LINUX_TIPC_H
++#include <linux/tipc.h>
++#else
+ #include <net/tipc/tipc.h>
++#endif
+ 
+ 
+ #define PIL_PLUGINTYPE          HB_COMM_TYPE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heartbeat.git/commitdiff/f52968a55a9ea30e83fd82604c16e108ffd9c9a0