Author: kevin
Update of /cvs/pkgs/rpms/heartbeat/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10124
Modified Files:
heartbeat.spec
Added Files:
heartbeat-3.0.0-haresources.patch
Log Message:
Add patch to fix haresource based clusters - fixes #576608
heartbeat-3.0.0-haresources.patch:
heartbeat.in | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE heartbeat-3.0.0-haresources.patch ---
diff -Nur Linux-HA-Dev-0daab7da36a8.orig/heartbeat/init.d/heartbeat.in
Linux-HA-Dev-0daab7da36a8/heartbeat/init.d/heartbeat.in
--- Linux-HA-Dev-0daab7da36a8.orig/heartbeat/init.d/heartbeat.in 2009-08-18
15:54:56.000000000 -0600
+++ Linux-HA-Dev-0daab7da36a8/heartbeat/init.d/heartbeat.in 2010-04-30 13:34:36.000000000
-0600
@@ -49,6 +49,7 @@
HA_DIR=@sysconfdir(a)/ha.d; export HA_DIR
CONFIG=$HA_DIR/ha.cf
. $HA_DIR/shellfuncs
+HA_NOARCHBIN=@HA_NOARCHDATAHBDIR@
LOCKDIR=@localstatedir@/lock/subsys
RUNDIR=@localstatedir@/run
Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-13/heartbeat.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- heartbeat.spec 22 Feb 2010 14:16:11 -0000 1.41
+++ heartbeat.spec 30 Apr 2010 19:58:52 -0000 1.42
@@ -2,7 +2,7 @@
# When downloading directly from Mercurial, it will automatically add this prefix
# Invoking 'hg archive' wont but you can add one with:
# hg archive -t tgz -p "Linux-HA-Dev-" -r $upstreamversion
$upstreamversion.tar.gz
-%global specversion 6
+%global specversion 7
%global upstreamprefix Linux-HA-Dev-
%global upstreamversion 0daab7da36a8
@@ -21,6 +21,7 @@ URL:
http://linux-ha.org/
Group: System Environment/Daemons
Source0:
http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
Patch1: dso.patch
+Patch2: heartbeat-3.0.0-haresources.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
BuildRequires: iputils
@@ -89,6 +90,7 @@ Headers and shared libraries for writing
%prep
%setup -q -n %{upstreamprefix}%{upstreamversion}
%patch1 -p0
+%patch2 -p1
%build
./bootstrap
@@ -178,6 +180,9 @@ fi
%{_libdir}/*.so
%changelog
+* Fri Apr 30 2010 Kevin Fenzi <kevin(a)tummy.com> - 3.0.0-0.7.0daab7da36a8.hg
+- Add patch to fix haresource based clusters - fixes #576608
+
* Mon Feb 22 2010 Andrew Beekhof <andrew(a)beekhof.net> - 3.0.0-0.6.0daab7da36a8.hg
- Correctly link to all required libraries when building