- added heartbeat-libexecdir patch: ensure to use consistent HB_DAEMON_DIR; release 2

diff --git a/pacemaker-heartbeat-libexecdir.patch b/pacemaker-heartbeat-libexecdir.patch
new file mode 100644 (file)
index 0000000..0182dbc
--- /dev/null
+++ b/pacemaker-heartbeat-libexecdir.patch
@@ -0,0 +1,11 @@
+--- pacemaker-Pacemaker-1.1.19/configure.ac.orig       2018-09-03 19:49:56.608934960 +0200
++++ pacemaker-Pacemaker-1.1.19/configure.ac    2018-09-03 19:55:53.318930891 +0200
+@@ -1110,7 +1110,7 @@
+ AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", Location for Pacemaker daemons)
+ AC_SUBST(CRM_DAEMON_DIR)
+ 
+-HB_DAEMON_DIR=`try_extract_header_define $GLUE_HEADER HA_LIBHBDIR $libdir/heartbeat`
++HB_DAEMON_DIR=`try_extract_header_define $GLUE_HEADER GLUE_DAEMON_DIR $libexecdir/heartbeat`
+ AC_DEFINE_UNQUOTED(HB_DAEMON_DIR,"$HB_DAEMON_DIR", Location Heartbeat expects Pacemaker daemons to be in)
+ AC_SUBST(HB_DAEMON_DIR)
+ 

diff --git a/pacemaker.spec b/pacemaker.spec
index a0c20a81d678430cecc5cab3f21a5add293347ff..0d6631809904a949147988ed566567c76030a4d4 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -16,7 +16,7 @@ Summary:      The scalable High-Availability cluster resource manager
 Summary(pl.UTF-8):     Skalowalny zarządca zasobów klastrów o wysokiej dostępności
 Name:          pacemaker
 Version:       1.1.19
-Release:       1
+Release:       2
 License:       GPL v2+, LGPL v2.1+
 Group:         Applications/System
 #Source0Download: https://github.com/ClusterLabs/pacemaker/releases
@@ -30,6 +30,7 @@ Patch1:               %{name}-manpage_xslt.patch
 Patch2:                %{name}-update.patch
 Patch3:                %{name}-man.patch
 Patch4:                %{name}-libs.patch
+Patch5:                %{name}-heartbeat-libexecdir.patch
 URL:           http://clusterlabs.org/wiki/Main_Page
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel}
 BuildRequires: asciidoc
@@ -189,6 +190,7 @@ lub w kontenerach uruchomionych na klastrze opartym o Pacemaker.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}