packages (pacemaker-1_1): pacemaker/pacemaker-libs.patch, pacemaker/pacemak...
jajcus
jajcus at pld-linux.org
Wed Jun 6 10:52:17 CEST 2012
Author: jajcus Date: Wed Jun 6 08:52:17 2012 GMT
Module: packages Tag: pacemaker-1_1
---- Log message:
- Version: 1.1.7
- allow building support for both Heartbeat and Corosync backends
- backend support separated into subpackages
---- Files affected:
packages/pacemaker:
pacemaker-libs.patch (1.3 -> 1.3.2.1) , pacemaker.spec (1.17 -> 1.17.2.1)
---- Diffs:
================================================================
Index: packages/pacemaker/pacemaker-libs.patch
diff -u packages/pacemaker/pacemaker-libs.patch:1.3 packages/pacemaker/pacemaker-libs.patch:1.3.2.1
--- packages/pacemaker/pacemaker-libs.patch:1.3 Mon Jun 4 11:41:30 2012
+++ packages/pacemaker/pacemaker-libs.patch Wed Jun 6 10:52:12 2012
@@ -1,22 +1,35 @@
---- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/pengine/Makefile.am 2010-06-23 20:08:40.000000000 +0200
-+++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/pengine/Makefile.am 2011-04-28 10:04:50.773343305 +0200
-@@ -31,10 +31,13 @@
+diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am
+--- ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am 2012-03-28 08:14:13.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am 2012-06-06 08:26:09.000000000 +0200
+@@ -39,7 +39,7 @@
+ rm -f *.pc
+
+ ## Subdirectories...
+-SUBDIRS = common pengine transition cib fencing cluster plugins
++SUBDIRS = common pengine cib transition fencing cluster plugins
+ DIST_SUBDIRS = $(SUBDIRS) ais
+
+ if BUILD_CS_PLUGIN
+diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am
+--- ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am 2012-03-28 08:14:13.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am 2012-06-06 08:28:21.000000000 +0200
+@@ -31,10 +31,12 @@
libpe_rules_la_LDFLAGS = -version-info 2:0:0
- libpe_rules_la_SOURCES = $(rule_files)
+ libpe_rules_la_SOURCES = $(rule_files)
+libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
- libpe_status_la_LDFLAGS = -version-info 2:0:0
+ libpe_status_la_LDFLAGS = -version-info 3:0:0
libpe_status_la_SOURCES = $(rule_files) $(status_files)
--libpe_status_la_LIBADD = -llrm
-+libpe_status_la_LIBADD = -llrm -lncurses \
-+ $(top_builddir)/lib/common/libcrmcommon.la \
-+ $(top_builddir)/lib/cib/libcib.la
+-libpe_status_la_LIBADD = -llrm @CURSESLIBS@
++libpe_status_la_LIBADD = -llrm @CURSESLIBS@ \
++ $(top_builddir)/lib/common/libcrmcommon.la
clean-generic:
rm -f *.log *.debug *~
---- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/transition/Makefile.am 2010-06-23 20:08:40.000000000 +0200
-+++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/transition/Makefile.am 2011-04-28 10:06:49.623343760 +0200
+diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am
+--- ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am 2012-03-28 08:14:13.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am 2012-06-06 08:22:40.000000000 +0200
@@ -29,6 +29,7 @@
libtransitioner_la_LDFLAGS = -version-info 1:0:0
@@ -25,14 +38,3 @@
clean-generic:
rm -f *~
---- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/lib/Makefile.am 2010-06-23 20:08:40.000000000 +0200
-+++ Pacemaker-1-0-Pacemaker-1.0.9.1/lib/Makefile.am 2011-04-28 10:09:28.876677338 +0200
-@@ -18,7 +18,7 @@
- MAINTAINERCLEANFILES = Makefile.in
-
- ## Subdirectories...
--SUBDIRS = common pengine transition cib fencing plugins
-+SUBDIRS = common cib pengine transition fencing plugins
- DIST_SUBDIRS = $(SUBDIRS) ais
-
- if BUILD_AIS_SUPPORT
================================================================
Index: packages/pacemaker/pacemaker.spec
diff -u packages/pacemaker/pacemaker.spec:1.17 packages/pacemaker/pacemaker.spec:1.17.2.1
--- packages/pacemaker/pacemaker.spec:1.17 Mon Jun 4 13:00:23 2012
+++ packages/pacemaker/pacemaker.spec Wed Jun 6 10:52:12 2012
@@ -1,18 +1,24 @@
# $Revision$, $Date$
-%bcond_with corosync # by default use heartbeat
-%bcond_without heartbeat # by default use heartbeat
+#
+# TODO:
+# - optional support for complete openais stack (corosync is often enough)
+
+%bcond_without corosync # build with corosync stack
+%bcond_without heartbeat # build without heartbeat stack
Summary: The scalable High-Availability cluster resource manager
Name: pacemaker
-Version: 1.0.12
-Release: 1
+Version: 1.1.7
+Release: 0.1
License: GPL v2+; LGPL v2.1+
Group: Applications/System
-Source0: https://github.com/ClusterLabs/pacemaker-1.0/tarball/Pacemaker-%{version}
-# Source0-md5: f8ff6475e68ef8ce765305c24dc1d2a5
+# https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-%{version}
+Source0: ClusterLabs-pacemaker-Pacemaker-%{version}-0-gee0730e.tar.gz
+# Source0-md5: 61076a946cf2ba549dce1458e2ef76e2
Source1: %{name}.tmpfiles
Patch0: %{name}-ncurses.patch
Patch1: %{name}-libs.patch
URL: http://clusterlabs.org/wiki/Main_Page
+BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
@@ -35,13 +41,14 @@
BuildRequires: pciutils-devel
BuildRequires: cluster-glue-libs-devel
Requires: %{name}-libs = %{version}-%{release}
-%{?with_corosync:Requires: corosync}
-%{?with_heartbeat:Requires: heartbeat}
Provides: group(haclient)
Provides: user(hacluster)
-Conflicts: heartbeat < 2.99.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# Unresolved symbol in libpe_status.so.3.0.0: get_object_root
+# not handled by -libs patch, as it is a circular dependency
+%define skip_post_check_so libpe_status.so.*
+
%description
Pacemaker makes use of your cluster infrastructure (either OpenAIS or
Heartbeat) to stop, start and monitor the health of the services (aka.
@@ -61,6 +68,26 @@
%description libs
Shared libraries for Pacemaker.
+%package heartbeat
+Summary: Pacemaker for Heartbeat cluster
+Group: Applications/System
+Requires: heartbeat
+Obsoletes: %{name} < 1.1
+Conflicts: heartbeat < 2.99.0
+Requires: %{name} = %{version}-%{release}
+
+%description heartbeat
+This package allows using Pacemaker on a Heartbeat cluster.
+
+%package corosync
+Summary: Pacemaker for Corosync cluster
+Group: Applications/System
+Requires: corosync
+Requires: %{name} = %{version}-%{release}
+
+%description corosync
+This package allows using Pacemaker on a Corosync cluster.
+
%package devel
Summary: Header files for Pacemaker libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Pacemaker
@@ -80,7 +107,7 @@
Static Pacemaker libraries.
%prep
-%setup -qn ClusterLabs-pacemaker-1.0-066152e
+%setup -qn ClusterLabs-pacemaker-b5b0a7b
%patch0 -p1
%patch1 -p1
@@ -92,10 +119,9 @@
%{__automake}
%configure \
- %{?with_heartbeat:--with-heartbeat} \
- %{!?with_heartbeat:--without-heartbeat} \
- %{?with_corosync:--with-ais} \
- %{?without_corosync:--without-ais} \
+ CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}" \
+ --with-heartbeat%{!?with_heartbeat:=no} \
+ --with-corosync%{!?with_corosync:=no} \
--with-snmp \
--with-esmtp \
--disable-fatal-warnings
@@ -104,7 +130,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+install -d $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,/etc/rc.d}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -114,6 +140,8 @@
install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -121,54 +149,71 @@
%groupadd -g 60 haclient
%useradd -u 17 -d /var/lib/heartbeat/cores/hacluster -c "Heartbeat User" -g haclient hacluster
+%post corosync
+/sbin/chkconfig --add %{name}
+%service %{name} restart "%{name} daemon"
+
+%systemd_post %{name}.service
+
+%preun
+if [ "$1" = "0" ]; then
+ %service %{name} stop
+ /sbin/chkconfig --del %{name}
+fi
+%systemd_preun %{name}.service
+
+%postun corosync
+%systemd_reload
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
-%doc doc/README* doc/*.html doc/*.txt AUTHORS COPYING* doc/Pacemaker_Explained
+%doc doc/README* doc/*.html doc/*.txt AUTHORS COPYING*
%{_datadir}/pacemaker
-%dir %{_libdir}/heartbeat/plugins/RAExec
-%attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/*.so
-%dir %{_libdir}/heartbeat/stonithdtest
-%if %{with corosync}
-%dir %{_libdir}/lcrso
-%{_libdir}/lcrso/pacemaker.lcrso
-%endif
-%attr(755,root,root) %{_libdir}/heartbeat/stonithdtest/apitest
-%attr(755,root,root) %{_libdir}/heartbeat/atest
-%attr(755,root,root) %{_libdir}/heartbeat/attrd
-%attr(755,root,root) %{_libdir}/heartbeat/cib
-%attr(755,root,root) %{_libdir}/heartbeat/cibmon
-%attr(755,root,root) %{_libdir}/heartbeat/crmd
-%attr(755,root,root) %{_libdir}/heartbeat/haresources2cib.py
-%attr(755,root,root) %{_libdir}/heartbeat/hb2openais.sh
-%attr(755,root,root) %{_libdir}/heartbeat/pengine
-%attr(755,root,root) %{_libdir}/heartbeat/pingd
-%attr(755,root,root) %{_libdir}/heartbeat/stonithd
-%attr(755,root,root) %{_libdir}/heartbeat/crm_primitive.py
-%attr(755,root,root)%{_libdir}/heartbeat/hb2openais-helper.py
-%{_libdir}/heartbeat/*.py[co]
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/attrd
+%attr(755,root,root) %{_libdir}/%{name}/cib
+%attr(755,root,root) %{_libdir}/%{name}/cibmon
+%attr(755,root,root) %{_libdir}/%{name}/crmd
+%attr(755,root,root) %{_libdir}/%{name}/hb2openais.sh
+%attr(755,root,root) %{_libdir}/%{name}/pengine
+%attr(755,root,root) %{_libdir}/%{name}/stonith-test
+%attr(755,root,root) %{_libdir}/%{name}/stonithd
+%{_libdir}/%{name}/*.py*
+%attr(755,root,root) %{_bindir}/ccs2cib
+%attr(755,root,root) %{_bindir}/ccs_flatten
+%attr(755,root,root) %{_bindir}/disable_rgmanager
+%attr(755,root,root) %{_sbindir}/attrd_updater
%attr(755,root,root) %{_sbindir}/cibadmin
+%attr(755,root,root) %{_sbindir}/cibpipe
+%attr(755,root,root) %{_sbindir}/crm
%attr(755,root,root) %{_sbindir}/crm_attribute
%attr(755,root,root) %{_sbindir}/crm_diff
%attr(755,root,root) %{_sbindir}/crm_failcount
%attr(755,root,root) %{_sbindir}/crm_master
%attr(755,root,root) %{_sbindir}/crm_mon
-%attr(755,root,root) %{_sbindir}/crm
+%attr(755,root,root) %{_sbindir}/crm_node
+%attr(755,root,root) %{_sbindir}/crm_report
%attr(755,root,root) %{_sbindir}/crm_resource
+%attr(755,root,root) %{_sbindir}/crm_simulate
+%attr(755,root,root) %{_sbindir}/crm_shadow
%attr(755,root,root) %{_sbindir}/crm_standby
+%attr(755,root,root) %{_sbindir}/crm_ticket
+%attr(755,root,root) %{_sbindir}/crm_uuid
%attr(755,root,root) %{_sbindir}/crm_verify
%attr(755,root,root) %{_sbindir}/crmadmin
+%attr(755,root,root) %{_sbindir}/fence_legacy
+%attr(755,root,root) %{_sbindir}/fence_pcmk
%attr(755,root,root) %{_sbindir}/iso8601
-%attr(755,root,root) %{_sbindir}/attrd_updater
%attr(755,root,root) %{_sbindir}/ptest
-%attr(755,root,root) %{_sbindir}/crm_shadow
-%attr(755,root,root) %{_sbindir}/cibpipe
-%attr(755,root,root) %{_sbindir}/crm_node
-%attr(755,root,root) %{_sbindir}/crm_uuid
+%attr(755,root,root) %{_sbindir}/stonith_admin
%{py_sitedir}/crm
%{py_sitedir}/cts
%{_datadir}/snmp/mibs
%{_mandir}/man8/*.8*
-%dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm
+%{_mandir}/man7/*.7*
%dir %attr(750,hacluster,haclient) %{_var}/lib/pengine
%dir %attr(750,hacluster,haclient) %{_var}/run/crm
%dir %{_prefix}/lib/ocf/resource.d/pacemaker
@@ -190,12 +235,34 @@
%attr(755,root,root) %{_libdir}/lib*.so.*.*
%attr(755,root,root) %{_libdir}/lib*.so.[0-9]
+%if %{with heartbeat}
+%files heartbeat
+%defattr(644,root,root,755)
+%dir %{_libdir}/heartbeat/plugins/RAExec
+%attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/*.so
+%attr(755,root,root) %{_libdir}/heartbeat/attrd
+%attr(755,root,root) %{_libdir}/heartbeat/cib
+%attr(755,root,root) %{_libdir}/heartbeat/crmd
+%attr(755,root,root) %{_libdir}/heartbeat/pengine
+%attr(755,root,root) %{_libdir}/heartbeat/stonithd
+%dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm
+%endif
+
+%if %{with corosync}
+%files corosync
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/pacemakerd
+%attr(755,root,root) /etc/rc.d/init.d/%{name}
+%{systemdunitdir}/%{name}.service
+%{_libdir}/lcrso/pacemaker.lcrso
+%endif
+
%files devel
%defattr(644,root,root,755)
%{_includedir}/pacemaker
-%{_includedir}/heartbeat/fencing
%{_libdir}/*.so
%{_libdir}/*.la
+%{_pkgconfigdir}/*.pc
%files static
%defattr(644,root,root,755)
@@ -207,6 +274,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17.2.1 2012/06/06 08:52:12 jajcus
+- Version: 1.1.7
+- allow building support for both Heartbeat and Corosync backends
+- backend support separated into subpackages
+
Revision 1.17 2012/06/04 11:00:23 jajcus
- Version: 1.0.12
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/pacemaker/pacemaker-libs.patch?r1=1.3&r2=1.3.2.1
http://cvs.pld-linux.org/packages/pacemaker/pacemaker.spec?r1=1.17&r2=1.17.2.1
More information about the pld-cvs-commit
mailing list