[packages/cluster-glue] - updated to 1.0.12 - updated opt patch - added rc patch (install both SysV and systemd scripts; fix

Fri Dec 18 22:54:46 CET 2015

commit aed838227ef4e413015344229a539f5b9a9dcdad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 18 22:56:04 2015 +0100

    - updated to 1.0.12
    - updated opt patch
    - added rc patch (install both SysV and systemd scripts; fix HA_VARRUNDIR in .service file)

 cluster-glue-opt.patch |  8 ++++----
 cluster-glue-rc.patch  | 20 ++++++++++++++++++++
 cluster-glue.spec      | 27 +++++++++++++++------------
 3 files changed, 39 insertions(+), 16 deletions(-)
---

diff --git a/cluster-glue.spec b/cluster-glue.spec
index e5274e5..e69b606 100644
--- a/cluster-glue.spec
+++ b/cluster-glue.spec
@@ -9,17 +9,19 @@
 Summary:	Reusable cluster components
 Summary(pl.UTF-8):	Komponenty klastrowe wielokrotnego użytku
 Name:		cluster-glue
-Version:	1.0.11
-Release:	8
+Version:	1.0.12
+Release:	1
 License:	GPL v2+ and LGPL v2+
 Group:		Aplications/System
+#Source0Download: http://linux-ha.org/wiki/Downloads
 Source0:	http://hg.linux-ha.org/glue/archive/glue-%{version}.tar.bz2
-# Source0-md5:	7d0acd99d43edac849dc76f43cfa4c7f
-Source1:	logd.service
+# Source0-md5:	ec620466d6f23affa3b074b72bca7870
+#Source1:	logd.service
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-opt.patch
-Patch2:		x32-long-long-time-types.patch
-URL:		http://www.linux-ha.org/
+Patch2:		%{name}-rc.patch
+Patch3:		x32-long-long-time-types.patch
+URL:		http://linux-ha.org/wiki/Cluster_Glue
 BuildRequires:	OpenIPMI-devel >= 1.4
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -141,8 +143,9 @@ STONITH (Shoot The Other Node In The Head) to interfejs służący do
 %setup -q -n Reusable-Cluster-Components-glue--glue-%{version}
 %patch0 -p1
 %patch1 -p1
-%ifarch x32
 %patch2 -p1
+%ifarch x32
+%patch3 -p1
 %endif
 
 sed -i -e's;#!/usr/bin/env \(python\|perl\);#!/usr/bin/\1;' \
@@ -158,9 +161,11 @@ sed -i -e's;#!/usr/bin/env \(python\|perl\);#!/usr/bin/\1;' \
 	--docdir=%{_docdir}/%{name}-%{version} \
 	--disable-fatal-warnings \
 	--disable-static \
+	--enable-ipmilan \
 	--with-daemon-group=haclient \
 	--with-daemon-user=hacluster \
-	--with-initdir=/etc/rc.d/init.d
+	--with-initdir=/etc/rc.d/init.d \
+	--with-rundir=/var/run
 %{__make}
 
 %install
@@ -172,8 +177,8 @@ install -d $RPM_BUILD_ROOT%{systemdunitdir}
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-%{__sed} -e 's;@libdir@;%{_libdir};g' \
-	%{SOURCE1} > $RPM_BUILD_ROOT%{systemdunitdir}/logd.service
+#%{__sed} -e 's;@libdir@;%{_libdir};g' \
+#	%{SOURCE1} > $RPM_BUILD_ROOT%{systemdunitdir}/logd.service
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
@@ -216,7 +221,6 @@ fi
 %attr(755,root,root) %{_sbindir}/hb_report
 %attr(755,root,root) %{_sbindir}/lrmadmin
 %attr(755,root,root) %{_sbindir}/meatclient
-%attr(755,root,root) %{_sbindir}/sbd
 %attr(755,root,root) %{_sbindir}/cibsecret
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man8/ha_logd.8*
@@ -228,7 +232,6 @@ fi
 %attr(755,root,root) %{_datadir}/%{name}/ha_cf_support.sh
 %attr(755,root,root) %{_datadir}/%{name}/openais_conf_support.sh
 %attr(755,root,root) %{_datadir}/%{name}/utillib.sh
-%attr(755,root,root) %{_datadir}/%{name}/combine-logs.pl
 %attr(755,root,root) %{_datadir}/%{name}/ha_log.sh
 
 %dir %{_libdir}/heartbeat/plugins/RAExec
diff --git a/cluster-glue-opt.patch b/cluster-glue-opt.patch
index a28bcd6..0d61192 100644
--- a/cluster-glue-opt.patch
+++ b/cluster-glue-opt.patch
@@ -1,13 +1,13 @@
---- Reusable-Cluster-Components-glue--glue-1.0.11/configure.ac.orig	2012-10-15 15:58:55.000000000 +0200
-+++ Reusable-Cluster-Components-glue--glue-1.0.11/configure.ac	2013-09-06 16:26:42.523189874 +0200
-@@ -1199,10 +1199,8 @@
+--- Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac.orig	2015-12-15 22:12:07.252626084 +0100
++++ Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac	2015-12-15 22:14:16.329287335 +0100
+@@ -1223,10 +1223,8 @@
  fi
  
  if test "$GCC" != yes; then
 -        CFLAGS="$CFLAGS -g"
  	enable_fatal_warnings=no
  else
--        CFLAGS="$CFLAGS -ggdb3 -O0"
+-        CFLAGS="$CFLAGS -ggdb"
  
  	# We had to eliminate -Wnested-externs because of libtool changes
          EXTRA_FLAGS="-fgnu89-inline
diff --git a/cluster-glue-rc.patch b/cluster-glue-rc.patch
new file mode 100644
index 0000000..03fb2c2
--- /dev/null
+++ b/cluster-glue-rc.patch
@@ -0,0 +1,20 @@
+--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am.orig	2014-07-18 13:40:19.000000000 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am	2015-12-15 22:20:41.372604508 +0100
+@@ -51,6 +51,5 @@
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = \
+         logd.service
+-else
+-initd_SCRIPTS     = logd
+ endif
++initd_SCRIPTS     = logd
+--- Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac.orig	2015-12-16 21:28:55.002442339 +0100
++++ Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac	2015-12-16 21:47:06.725729858 +0100
+@@ -390,6 +390,7 @@
+ AC_DEFINE_UNQUOTED(GLUE_SHARED_DIR,"$GLUE_SHARED_DIR", Location for scripts)
+ AC_SUBST(GLUE_SHARED_DIR)
+ 
++eval eval HA_VARRUNDIR=$GLUE_STATE_DIR
+ AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$GLUE_STATE_DIR", Where Heartbeat keeps state files and sockets - old name)
+ AC_SUBST(HA_VARRUNDIR)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cluster-glue.git/commitdiff/aed838227ef4e413015344229a539f5b9a9dcdad

