packages: heartbeat/heartbeat.spec, heartbeat/heartbeat-drbd-outdate-libs.p...

[marmarek]

Author: marmarek                     Date: Wed Apr 27 15:21:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix library linking

---- Files affected:
packages/heartbeat:
   heartbeat.spec (1.100 -> 1.101) , heartbeat-drbd-outdate-libs.patch (NONE -> 1.1)  (NEW), heartbeat-libs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/heartbeat/heartbeat.spec
diff -u packages/heartbeat/heartbeat.spec:1.100 packages/heartbeat/heartbeat.spec:1.101
--- packages/heartbeat/heartbeat.spec:1.100	Sat May 22 18:39:49 2010
+++ packages/heartbeat/heartbeat.spec	Wed Apr 27 17:21:50 2011
@@ -31,6 +31,8 @@
 # Source0-md5:	3c45d668ebb9f964caa1b40fd0808745
 Source1:	%{name}.init
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-drbd-outdate-libs.patch
+Patch2:		%{name}-libs.patch
 URL:		http://www.linux-ha.org/Heartbeat
 BuildRequires:	OpenIPMI-devel >= 2.0.3
 BuildRequires:	autoconf
@@ -149,6 +151,8 @@
 %prep
 %setup -qn %{name}-%{version}-%{subver}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 rm -rf libltdl
 
 %build
@@ -297,6 +301,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2011/04/27 15:21:50  marmarek
+- fix library linking
+
 Revision 1.100  2010/05/22 16:39:49  gotar
 - fixed Group
 

================================================================
Index: packages/heartbeat/heartbeat-drbd-outdate-libs.patch
diff -u /dev/null packages/heartbeat/heartbeat-drbd-outdate-libs.patch:1.1
--- /dev/null	Wed Apr 27 17:21:56 2011
+++ packages/heartbeat/heartbeat-drbd-outdate-libs.patch	Wed Apr 27 17:21:50 2011
@@ -0,0 +1,11 @@
+--- heartbeat-3.0.2-rc2/contrib/drbd-outdate-peer/Makefile.am.orig	2011-04-27 15:06:45.276677110 +0200
++++ heartbeat-3.0.2-rc2/contrib/drbd-outdate-peer/Makefile.am	2011-04-27 15:06:52.406677078 +0200
+@@ -39,7 +39,7 @@
+ 			$(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB)
+ 
+ drbd_peer_outdater_SOURCES	= drbd-peer-outdater.c
+-drbd_peer_outdater_LDADD	= -lplumb
++drbd_peer_outdater_LDADD	= -lplumb $(GLIBLIB)
+ 
+ 
+ 

================================================================
Index: packages/heartbeat/heartbeat-libs.patch
diff -u /dev/null packages/heartbeat/heartbeat-libs.patch:1.1
--- /dev/null	Wed Apr 27 17:21:56 2011
+++ packages/heartbeat/heartbeat-libs.patch	Wed Apr 27 17:21:50 2011
@@ -0,0 +1,47 @@
+diff -ru heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am heartbeat-3.0.2-rc2/lib/apphb/Makefile.am
+--- heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am	2009-12-19 19:46:52.000000000 +0100
++++ heartbeat-3.0.2-rc2/lib/apphb/Makefile.am	2011-04-27 16:03:17.553343763 +0200
+@@ -38,4 +38,4 @@
+ libapphb_la_CFLAGS	= -lpthread
+ endif
+ 
+-libapphb_la_LDFLAGS	= -version-info 2:0:0 
++libapphb_la_LDFLAGS	= -version-info 2:0:0 -lglib-2.0 -lplumb
+diff -ru heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am
+--- heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am	2011-04-27 15:59:06.973343764 +0200
++++ heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am	2011-04-27 16:03:17.553343763 +0200
+@@ -44,8 +44,8 @@
+ lib_LTLIBRARIES		= libhbclient.la 
+ 
+ libhbclient_la_SOURCES	= client_lib.c
+-libhbclient_la_LDFLAGS	= -version-info 1:0:0
+-libhbclient_la_LIBADD	= $(top_builddir)/replace/libreplace.la  
++libhbclient_la_LDFLAGS	= -version-info 1:0:0 -lplumb
++libhbclient_la_LIBADD	= $(top_builddir)/replace/libreplace.la $(gliblib)
+ 
+ ## binary progs
+ halib_PROGRAMS		= api_test
+diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2/membership/ccm/Makefile.am
+--- heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am	2009-12-19 19:46:52.000000000 +0100
++++ heartbeat-3.0.2-rc2/membership/ccm/Makefile.am	2011-04-27 16:07:02.910011000 +0200
+@@ -82,7 +82,7 @@
+ 
+ 
+ libccmclient_la_SOURCES	= ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
+-libccmclient_la_LDFLAGS	= -version-info 1:0:0
++libccmclient_la_LDFLAGS	= -version-info 1:0:0 $(gliblib) -lplumb
+ 
+ 
+ ## library libclm.la
+@@ -95,7 +95,10 @@
+ 
+ ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
+ libclm_la_CFLAGS	= -g #-DPOSIX_THREADS
+-libclm_la_LDFLAGS	= -version-info 1:0:0
++libclm_la_LDFLAGS	= -version-info 1:0:0 \
++			  -lplumb \
++			  $(gliblib)
++libclm_la_LIBADD		= libccmclient.la
+ 
+ clmtest_SOURCES		= clmtest.c
+ clmtest_LDADD		= libclm.la libccmclient.la \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heartbeat/heartbeat.spec?r1=1.100&r2=1.101&f=u