X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pacemaker-libs.patch;h=2266cf234643edc9552fe4bf67e261e6ec45ba63;hb=69ee3b2ebd736db9d59789832c4f1271859da093;hp=8b93f3e8a36ebf3bc64119429c3294d205e3dc3f;hpb=5c69a269a539c60e9939039a89110dea8c38a1ad;p=packages%2Fpacemaker.git

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 8b93f3e..2266cf2 100644
--- 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