rpms/heartbeat/devel heartbeat-2.1.4-default-init.patch, NONE, 1.1 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 heartbeat.spec, 1.24, 1.25 IPaddr, 1.1, NONE

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv742

Modified Files:
	sources .cvsignore heartbeat.spec 
Added Files:
	heartbeat-2.1.4-default-init.patch 
Removed Files:
	IPaddr 
Log Message:
Update to 2.1.4
Drop upstreamed patch
Add patch to disable init script by default (#441286)


heartbeat-2.1.4-default-init.patch:

--- NEW FILE heartbeat-2.1.4-default-init.patch ---
diff -Nur Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in
--- Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in	2008-08-18 06:32:19.000000000 -0600
+++ Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in	2008-12-01 20:23:23.000000000 -0700
@@ -12,7 +12,7 @@
 #		We don't hate anyone, and like for everyone to use
 #		our software, no matter what OS or distribution you're using.
 #
-# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
 # description: Startup script high-availability services.
 # processname: heartbeat
 # pidfile: @localstatedir@/run/heartbeat.pid


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Feb 2008 20:24:12 -0000	1.9
+++ sources	2 Dec 2008 06:01:48 -0000	1.10
@@ -1 +1 @@
-bca53530a3802f7677772323047405cd  heartbeat-2.1.3.tar.gz
+2e53a9996beb1ff7611d3f7300586951  STABLE-2.1.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Feb 2008 20:24:12 -0000	1.9
+++ .cvsignore	2 Dec 2008 06:01:48 -0000	1.10
@@ -1 +1 @@
-heartbeat-2.1.3.tar.gz
+STABLE-2.1.4.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- heartbeat.spec	1 Dec 2008 15:00:30 -0000	1.24
+++ heartbeat.spec	2 Dec 2008 06:01:48 -0000	1.25
@@ -5,14 +5,14 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.1.3
-Release:          4%{?dist}
+Version:          2.1.4
+Release:          1%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
-Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
+Source0:          http://hg.linux-ha.org/lha-2.1/archive/STABLE-%{version}.tar.bz2
 Patch0:           heartbeat-fedora-pam.patch
-Patch1:           http://hg.linux-ha.org/dev/raw-diff/806faf36d956/resources/OCF/IPaddr
+Patch1:           heartbeat-2.1.4-default-init.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -25,6 +25,8 @@
 BuildRequires:    libtool
 BuildRequires:    libxml2-devel
 BuildRequires:    gettext
+BuildRequires:    bison
+BuildRequires:    flex
 %if %{ENABLE_MGMT}
 BuildRequires:    gnutls-devel 
 BuildRequires:    pam-devel
@@ -117,11 +119,12 @@
 GUI client for Heartbeat clusters
 
 %prep
-%setup -q
+%setup -q -n Heartbeat-STABLE-2-1-STABLE-%{version}
 %patch0 -p1
 %patch1 -p1
  
 %build
+./bootstrap
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
 CFLAGS=${RPM_OPT_FLAGS} \
 %configure \
@@ -338,6 +341,11 @@
 %{_bindir}/hb_gui
 
 %changelog
+* Mon Dec 01 2008 Kevin Fenzi <kevin at tummy.com> - 2.1.4-1
+- Update to 2.1.4
+- Drop upstreamed patch
+- Add patch to disable init script by default (#441286)
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.3-4
 - Rebuild for Python 2.6
 


--- IPaddr DELETED ---