[heartbeat] Update to 3.0.4

[Kevin Fenzi]

commit ea7f995ac9bf391f7cf2b82d2aa1369a7122ab78
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Sun Jan 23 16:08:44 2011 -0700

    Update to 3.0.4

 .gitignore                           |    1 +
 heartbeat-2.1.4-default-init.patch   |   12 -----------
 heartbeat-2.1.4-duplicate-drbd.patch |   11 ----------
 heartbeat-fedora-ccmuser.patch       |   12 -----------
 heartbeat-fedora-pam.patch           |   15 -------------
 heartbeat.spec                       |   37 ++++++++++++++++++++++------------
 sources                              |    3 +-
 7 files changed, 26 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5bcdd0e..fbbacdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 0daab7da36a8.tar.bz2
 dso.patch
+/STABLE-3.0.4.tar.bz2
diff --git a/heartbeat.spec b/heartbeat.spec
index e894b6e..5e5402f 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -2,11 +2,12 @@
 # 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 7
-%global upstreamprefix Linux-HA-Dev-
-%global upstreamversion 0daab7da36a8
+%global specversion 1
+#global upstreamprefix Linux-HA-Dev-
+%global upstreamprefix Heartbeat-3-0-
+%global upstreamversion STABLE-3.0.4
 
-%global alphatag %{upstreamversion}.hg
+#global alphatag %{upstreamversion}.hg
 
 %global           ENABLE_SNMP_SUBAGENT 0
 %global           gname haclient
@@ -14,13 +15,17 @@
 
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          3.0.0
+Version:          3.0.4
+# For dev snapshots
+#Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
-Source0:          http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
-Patch1:		  dso.patch
+# For dev snapshots
+#Source0:         http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
+Source0:          http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.4.tar.bz2
+Patch1:           heartbeat-3.0.4-disable-xinclude.patch
 Patch2:           heartbeat-3.0.0-haresources.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
@@ -40,6 +45,9 @@ BuildRequires:    zlib-devel
 BuildRequires:    mailx
 BuildRequires:    which
 BuildRequires:    cluster-glue-libs-devel
+BuildRequires:    libuuid-devel
+BuildRequires:    libxslt
+BuildRequires:    docbook-style-xsl
 Requires:         PyXML
 Requires:         resource-agents
 Requires:         cluster-glue-libs
@@ -89,7 +97,7 @@ Headers and shared libraries for writing programs for Heartbeat
 
 %prep
 %setup -q -n %{upstreamprefix}%{upstreamversion}
-%patch1 -p0 
+%patch1 -p1
 %patch2 -p1 
 
 %build
@@ -106,18 +114,17 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
+# disable xsltproc from trying to hit the net
+export XSLTPROC_OPTIONS=""
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # cleanup
 [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
 [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool
 find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT/%{_datadir}/doc/packages/%{name} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+mv $RPM_BUILD_ROOT/%{_datadir}/doc/%{name} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/heartbeat/cts
 
-sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,7 +147,6 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
-%exclude %{_sysconfdir}/ha.d/shellfuncs
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_datadir}/heartbeat/
@@ -159,6 +165,8 @@ fi
 %{_mandir}/man1/hb_delnode.1*
 %{_mandir}/man8/heartbeat.8*
 %{_mandir}/man8/apphbd.8*
+%{_mandir}/man5/authkeys.5*
+%{_mandir}/man5/ha.cf.5*
 %if %{ENABLE_SNMP_SUBAGENT}
 /LINUX-HA-MIB.mib
 %endif
@@ -180,6 +188,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Sun Jan 23 2011 Kevin Fenzi <kevin at tummy.com> - 3.0.4-1
+- Update to 3.0.4
+
 * Fri Apr 30 2010 Kevin Fenzi <kevin at tummy.com> - 3.0.0-0.7.0daab7da36a8.hg
 - Add patch to fix haresource based clusters - fixes #576608
 
diff --git a/sources b/sources
index 1cb9905..24bdb07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-278681d62d2c39b1748ac0eb8ae234d8  0daab7da36a8.tar.bz2
-8adb6c5433e1d5acf454f8c894afcd82  dso.patch
+9f2d1a7672da1a1a0872a2c372acf770  STABLE-3.0.4.tar.bz2