Author: marmarek Date: Thu Apr 28 21:55:42 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.0.9.1
- corosync (OpenAIS) support
- some linking fixes
---- Files affected:
packages/pacemaker:
pacemaker-ncurses.patch (1.1 -> 1.2) , pacemaker.spec (1.5 -> 1.6) ,
pacemaker-libs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/pacemaker/pacemaker-ncurses.patch
diff -u packages/pacemaker/pacemaker-ncurses.patch:1.1
packages/pacemaker/pacemaker-ncurses.patch:1.2
--- packages/pacemaker/pacemaker-ncurses.patch:1.1 Mon May 11 15:19:02 2009
+++ packages/pacemaker/pacemaker-ncurses.patch Thu Apr 28 23:55:37 2011
@@ -1,5 +1,5 @@
---- Pacemaker-1-0-Pacemaker-1.0.3/configure.in.orig 2009-05-11
14:26:54.000000000 +0200
-+++ Pacemaker-1-0-Pacemaker-1.0.3/configure.in 2009-05-11 14:26:54.000000000
+0200
+--- Pacemaker-1-0-Pacemaker-1.0.3/configure.ac.orig 2009-05-11
14:26:54.000000000 +0200
++++ Pacemaker-1-0-Pacemaker-1.0.3/configure.ac 2009-05-11 14:26:54.000000000
+0200
@@ -746,8 +746,12 @@
[
#if defined(HAVE_CURSES_H)
================================================================
Index: packages/pacemaker/pacemaker.spec
diff -u packages/pacemaker/pacemaker.spec:1.5
packages/pacemaker/pacemaker.spec:1.6
--- packages/pacemaker/pacemaker.spec:1.5 Tue Aug 25 21:16:41 2009
+++ packages/pacemaker/pacemaker.spec Thu Apr 28 23:55:37 2011
@@ -1,22 +1,22 @@
# $Revision$, $Date$
-#
-# TODO:
-# - OpenAIS support
-#
+%bcond_without corosync # by default use heartbeat
+%bcond_with heartbeat # by default use heartbeat
Summary: The scalable High-Availability cluster resource manager
Name: pacemaker
-Version: 1.0.3
+Version: 1.0.9.1
Release: 1
License: GPL v2+; LGPL v2.1+
Group: Applications/System
Source0:
http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-%{version}.tar.bz2
-# Source0-md5: b377be64de0920773168bda3abf54319
+# Source0-md5: c844d98a5e6163192dd9f073ba9856ff
Patch0: %{name}-ncurses.patch
Patch1: %{name}-liborder.patch
+Patch2: %{name}-libs.patch
URL: http://clusterlabs.org/wiki/Main_Page
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
+%{?with_corosync:BuildRequires: corosync-devel}
BuildRequires: e2fsprogs-devel
BuildRequires: glib2-devel
BuildRequires: gnutls-devel
@@ -30,9 +30,11 @@
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
BuildRequires: swig
Requires: %{name}-libs = %{version}-%{release}
-Requires: heartbeat
+%{?with_corosync:Requires: corosync}
+%{?with_heartbeat:Requires: heartbeat}
Provides: group(haclient)
Provides: user(hacluster)
Conflicts: heartbeat < 2.99.0
@@ -78,7 +80,8 @@
%prep
%setup -qn Pacemaker-1-0-Pacemaker-%{version}
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -88,8 +91,10 @@
%{__automake}
%configure \
- --with-heartbeat \
- --without-ais \
+ %{?with_heartbeat:--with-heartbeat} \
+ %{!?with_heartbeat:--without-heartbeat} \
+ %{?with_corosync:--with-ais} \
+ %{?without_corosync:--without-ais} \
--with-snmp \
--with-esmtp \
--disable-fatal-warnings
@@ -102,7 +107,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT%{_docdir}/packages
+rm -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
rm $RPM_BUILD_ROOT%{_libdir}/heartbeat/plugins/RAExec/*.{la,a}
%clean
@@ -114,7 +119,7 @@
%files
%defattr(644,root,root,755)
-%doc doc/README* doc/*.html doc/*.txt doc/AUTHORS doc/Design
+%doc doc/README* doc/*.html doc/*.txt AUTHORS COPYING* doc/Pacemaker_Explained
%{_datadir}/pacemaker
%dir %{_libdir}/heartbeat/plugins/RAExec
%attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/*.so
@@ -133,7 +138,6 @@
%{_libdir}/heartbeat/crm_primitive.py
%{_libdir}/heartbeat/hb2openais-helper.py
%{_libdir}/heartbeat/*.py[co]
-
%attr(755,root,root) %{_sbindir}/cibadmin
%attr(755,root,root) %{_sbindir}/crm_attribute
%attr(755,root,root) %{_sbindir}/crm_diff
@@ -152,12 +156,24 @@
%attr(755,root,root) %{_sbindir}/cibpipe
%attr(755,root,root) %{_sbindir}/crm_node
%attr(755,root,root) %{_sbindir}/crm_uuid
+%{py_sitedir}/crm
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
%{_mandir}/man8/*.8*
%dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm
%dir %attr(750,hacluster,haclient) %{_var}/lib/pengine
%dir %attr(750,hacluster,haclient) %{_var}/run/crm
-%attr(755,root,root) %{_libdir}/ocf/resource.d/pacemaker
-#%{_libexecdir}/lcrso/pacemaker.lcrso
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ClusterMon
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/Dummy
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/HealthCPU
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/HealthSMART
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/Stateful
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/SysInfo
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/SystemHealth
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/controld
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/o2cb
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ping
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/pingd
+%{_libexecdir}/lcrso/pacemaker.lcrso
%files libs
%defattr(644,root,root,755)
@@ -181,6 +197,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2011/04/28 21:55:37 marmarek
+- 1.0.9.1
+- corosync (OpenAIS) support
+- some linking fixes
+
Revision 1.5 2009/08/25 19:16:41 mmazur
- fix permissions for pacemaker ocf resources
- rel 1
================================================================
Index: packages/pacemaker/pacemaker-libs.patch
diff -u /dev/null packages/pacemaker/pacemaker-libs.patch:1.1
--- /dev/null Thu Apr 28 23:55:42 2011
+++ packages/pacemaker/pacemaker-libs.patch Thu Apr 28 23:55:37 2011
@@ -0,0 +1,61 @@
+diff -ru Pacemaker-1-0-Pacemaker-1.0.9.1.orig/pengine/Makefile.am
Pacemaker-1-0-Pacemaker-1.0.9.1/pengine/Makefile.am
+--- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/pengine/Makefile.am 2010-06-23
20:08:40.000000000 +0200
++++ Pacemaker-1-0-Pacemaker-1.0.9.1/pengine/Makefile.am 2011-04-28
08:53:55.536677098 +0200
+@@ -58,6 +58,7 @@
+ # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
+ libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \
+ native.c group.c clone.c master.c graph.c
++libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la
+
+ pengine_SOURCES = main.c
+ pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/cib/libcib.la
+diff -ru Pacemaker-1-0-Pacemaker-1.0.9.1.orig/tools/Makefile.am
Pacemaker-1-0-Pacemaker-1.0.9.1/tools/Makefile.am
+--- Pacemaker-1-0-Pacemaker-1.0.9.1.orig/tools/Makefile.am 2010-06-23
20:08:40.000000000 +0200
++++ Pacemaker-1-0-Pacemaker-1.0.9.1/tools/Makefile.am 2011-04-28
09:38:06.620010890 +0200
+@@ -85,7 +85,7 @@
+ crm_diff_LDADD = $(COMMONLIBS)
+
+ crm_mon_SOURCES = crm_mon.c
+-crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
++crm_mon_LDADD = $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm -ltinfo \
+ $(top_builddir)/lib/pengine/libpe_status.la
+
+ # Arguments could be made that this should live in crm/pengine
+--- 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 @@
+
+ libpe_rules_la_LDFLAGS = -version-info 2:0:0
+ 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_SOURCES = $(rule_files) $(status_files)
+-libpe_status_la_LIBADD = -llrm
++libpe_status_la_LIBADD = -llrm $(CURSESLIBS) \
++ $(top_builddir)/lib/common/libcrmcommon.la \
++ $(top_builddir)/lib/cib/libcib.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
+@@ -29,6 +29,7 @@
+
+ libtransitioner_la_LDFLAGS = -version-info 1:0:0
+ libtransitioner_la_CFLAGS = -I$(top_builddir)
++libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
+
+ 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacemaker/pacemaker-ncurses.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacemaker/pacemaker.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
