rpms/heartbeat/devel .cvsignore, 1.11, 1.12 heartbeat.spec, 1.37, 1.38 sources, 1.11, 1.12

[Andrew Beekhof]

Author: beekhof

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

Modified Files:
	.cvsignore heartbeat.spec sources 
Log Message:
Update requires. Source most C-defines from cluster-glue to ensure build consistency.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	17 Aug 2009 20:37:26 -0000	1.11
+++ .cvsignore	19 Aug 2009 06:36:15 -0000	1.12
@@ -1 +1 @@
-b37cbb1b036c.tar.bz2
+0daab7da36a8.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- heartbeat.spec	17 Aug 2009 20:37:26 -0000	1.37
+++ heartbeat.spec	19 Aug 2009 06:36:15 -0000	1.38
@@ -2,9 +2,9 @@
 # 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 3
+%global specversion 4
 %global upstreamprefix Linux-HA-Dev-
-%global upstreamversion b37cbb1b036c
+%global upstreamversion 0daab7da36a8
 
 %global alphatag %{upstreamversion}.hg
 
@@ -15,7 +15,7 @@
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          3.0.0
-Release:          %{?alphatag:0.}3%{?alphatag:.%{alphatag}}%{?dist}
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -40,6 +40,7 @@ BuildRequires:    which
 BuildRequires:    cluster-glue-libs-devel
 Requires:         PyXML
 Requires:         resource-agents
+Requires:         cluster-glue-libs
 Requires(pre):    shadow-utils
 Requires(pre):    cluster-glue
 Requires(post):   /sbin/chkconfig
@@ -175,6 +176,13 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.4.0daab7da36a8.hg
+- Make use of the specversion variable
+- Add explicit dependancy on cluster-glue-libs to prevent yum from trying to use 
+  the deprecated heartbeat-{pils|stonith} packages
+- Update to upstream version 0daab7da36a8
+  + Clean up configure. Source most variables from cluster-glue to ensure build consistency
+
 * Mon Aug 17 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.3.b37cbb1b036c.hg
 - Make use of the uname/gname variables
 - Use global instead of define for variables


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	17 Aug 2009 20:37:26 -0000	1.11
+++ sources	19 Aug 2009 06:36:15 -0000	1.12
@@ -1 +1 @@
-573d6b4a12dbf0175aecb08085358726  b37cbb1b036c.tar.bz2
+278681d62d2c39b1748ac0eb8ae234d8  0daab7da36a8.tar.bz2