OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jul-2006 09:51:30
Branch: HEAD Handle: 2006071408513000
Modified files:
openpkg-src/heartbeat heartbeat.patch heartbeat.spec
Log:
upgrading package: heartbeat 2.0.5 -> 2.0.6
Summary:
Revision Changes Path
1.6 +19 -13 openpkg-src/heartbeat/heartbeat.patch
1.17 +3 -3 openpkg-src/heartbeat/heartbeat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 heartbeat.patch
--- openpkg-src/heartbeat/heartbeat.patch 2 May 2006 12:24:08 -0000
1.5
+++ openpkg-src/heartbeat/heartbeat.patch 14 Jul 2006 07:51:30 -0000
1.6
@@ -88,19 +88,19 @@
has_init = 1;
}
Index: crm/admin/Makefile.in
---- crm/admin/Makefile.in.orig 2006-03-10 15:57:35 +0100
-+++ crm/admin/Makefile.in 2006-03-10 16:04:08 +0100
-@@ -466,8 +466,7 @@
+--- crm/admin/Makefile.in.orig 2006-07-13 18:57:27 +0200
++++ crm/admin/Makefile.in 2006-07-14 09:19:24 +0200
+@@ -480,8 +480,7 @@
noinst_HEADERS =
crmadmin_SOURCES = crmadmin.c
crmadmin_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crmadmin_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/crm/pengine/libpengine.la
-+crmadmin_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+- $(top_builddir)/lib/crm/pengine/libpe_status.la
++crmadmin_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la
$(COMMONLIBS)
crm_uuid_SOURCES = crm_uuid.c
crm_uuid_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-@@ -477,21 +476,18 @@
+@@ -491,24 +490,23 @@
cibadmin_LDADD = $(COMMONLIBS)
ccm_tool_SOURCES = ccm_epoche.c
ccm_tool_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
@@ -114,24 +114,30 @@
crm_mon_SOURCES = crm_mon.c
crm_mon_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_mon_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/crm/pengine/libpengine.la
-+crm_mon_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+- $(top_builddir)/lib/crm/pengine/libpe_status.la
++crm_mon_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la
$(COMMONLIBS)
+
+ # Arguments could be made that this should live in crm/pengine
crm_verify_SOURCES = crm_verify.c
crm_verify_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_verify_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/lib/crm/pengine/libpe_status.la \
- $(top_builddir)/crm/pengine/libpengine.la
-+crm_verify_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
++crm_verify_LDADD = \
++ $(top_builddir)/lib/crm/pengine/libpe_status.la \
++ $(top_builddir)/crm/pengine/libpengine.la \
++ $(COMMONLIBS)
crm_master_SOURCES = crm_attribute.c
crm_master_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-@@ -504,8 +500,7 @@
- crm_attribute_LDADD = $(COMMONLIBS)
+@@ -524,8 +522,7 @@
+ crm_failcount_LDADD = $(COMMONLIBS)
crm_resource_SOURCES = crm_resource.c
crm_resource_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_resource_LDADD = $(COMMONLIBS) \
-- $(top_builddir)/crm/pengine/libpengine.la
-+crm_resource_LDADD = $(top_builddir)/crm/pengine/libpengine.la
$(COMMONLIBS)
+- $(top_builddir)/lib/crm/pengine/libpe_status.la
++crm_resource_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la
$(COMMONLIBS)
iso8601_SOURCES = test.iso8601.c
iso8601_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 heartbeat.spec
--- openpkg-src/heartbeat/heartbeat.spec 16 May 2006 07:40:34 -0000
1.16
+++ openpkg-src/heartbeat/heartbeat.spec 14 Jul 2006 07:51:30 -0000
1.17
@@ -34,8 +34,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 2.0.5
-Release: 20060516
+Version: 2.0.6
+Release: 20060714
# list of sources
Source0: http://linux-ha.org/download/heartbeat-%{version}.tar.gz
@@ -58,7 +58,7 @@
%description
The heartbeat program is one of the core components of the Linux
High-Availability (Linux-HA) project. It provides "warm" failover
- between two nodes in either automatic or controll way. It uses
+ between two nodes in either automatic or controlled way. It uses
redundant communication links via Ethernet or serial line in
broadcast, multicast and unicast mode.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
