- builds; rel 0.2

Changed files:
    pacemaker-libs.patch -> 1.2
    pacemaker.spec -> 1.9

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 8b93f3e8a36ebf3bc64119429c3294d205e3dc3f..2266cf234643edc9552fe4bf67e261e6ec45ba63 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -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 @@ diff -ru Pacemaker-1-0-Pacemaker-1.0.9.1.orig/tools/Makefile.am Pacemaker-1-0-Pa
  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
  

diff --git a/pacemaker.spec b/pacemaker.spec
index 38fadd0291757bc05580164cb13d4462951bc31e..a4e850963675443d8600102364424ad92966e2ba 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,7 +3,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
@@ -19,7 +19,7 @@ BuildRequires:        bzip2-devel
 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
@@ -156,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -172,7 +173,6 @@ rm -rf $RPM_BUILD_ROOT
 %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)