[packages/pacemaker] - added heartbeat-libexecdir patch: ensure to use consistent HB_DAEMON_DIR; release 2
qboosh
qboosh at pld-linux.org
Mon Sep 3 20:21:41 CEST 2018
commit 4cf3b69213a150071baa9ea2d4bdfc2303a7d789
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Sep 3 20:24:33 2018 +0200
- added heartbeat-libexecdir patch: ensure to use consistent HB_DAEMON_DIR; release 2
pacemaker-heartbeat-libexecdir.patch | 11 +++++++++++
pacemaker.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index a0c20a8..0d66318 100644
--- 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}
diff --git a/pacemaker-heartbeat-libexecdir.patch b/pacemaker-heartbeat-libexecdir.patch
new file mode 100644
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)
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/4cf3b69213a150071baa9ea2d4bdfc2303a7d789
More information about the pld-cvs-commit
mailing list