packages: pacemaker/pacemaker-libs.patch, pacemaker/pacemaker.spec - builds...

[mmazur]

Author: mmazur                       Date: Tue Jul 19 18:57:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds; rel 0.2

---- Files affected:
packages/pacemaker:
   pacemaker-libs.patch (1.1 -> 1.2) , pacemaker.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/pacemaker/pacemaker-libs.patch
diff -u packages/pacemaker/pacemaker-libs.patch:1.1 packages/pacemaker/pacemaker-libs.patch:1.2
--- packages/pacemaker/pacemaker-libs.patch:1.1	Thu Apr 28 23:55:37 2011
+++ packages/pacemaker/pacemaker-libs.patch	Tue Jul 19 20:56:57 2011
@@ -1,26 +1,3 @@
-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 @@
@@ -32,7 +9,7 @@
  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) \
++libpe_status_la_LIBADD	= -llrm -ltinfo -lncurses \
 +			  $(top_builddir)/lib/common/libcrmcommon.la \
 +			  $(top_builddir)/lib/cib/libcib.la
  

================================================================
Index: packages/pacemaker/pacemaker.spec
diff -u packages/pacemaker/pacemaker.spec:1.8 packages/pacemaker/pacemaker.spec:1.9
--- packages/pacemaker/pacemaker.spec:1.8	Tue Jul 19 20:07:13 2011
+++ packages/pacemaker/pacemaker.spec	Tue Jul 19 20:56:57 2011
@@ -4,7 +4,7 @@
 Summary:	The scalable High-Availability cluster resource manager
 Name:		pacemaker
 Version:	1.0.11
-Release:	0.1
+Release:	0.2
 License:	GPL v2+; LGPL v2.1+
 Group:		Applications/System
 Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-%{version}.tar.bz2
@@ -20,7 +20,7 @@
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gnutls-devel
-BuildRequires:	heartbeat-devel >= 2.99
+%{?with_heartbeat:BuildRequires: heartbeat-devel >= 2.99}
 BuildRequires:	libesmtp-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
@@ -157,6 +157,7 @@
 %attr(755,root,root) %{_sbindir}/crm_node
 %attr(755,root,root) %{_sbindir}/crm_uuid
 %{py_sitedir}/crm
+%{py_sitedir}/cts
 %{_datadir}/snmp/mibs/PCMK-MIB.txt
 %{_mandir}/man8/*.8*
 %dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm
@@ -173,7 +174,6 @@
 %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)
@@ -197,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/07/19 18:56:57  mmazur
+- builds; rel 0.2
+
 Revision 1.8  2011/07/19 18:07:13  mmazur
 - flipped bconds; they were wrong
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacemaker/pacemaker-libs.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacemaker/pacemaker.spec?r1=1.8&r2=1.9&f=u