rpms/heartbeat/F-12 heartbeat.spec,1.39,1.40

[Andrew Beekhof]

Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1662

Modified Files:
	heartbeat.spec 
Log Message:
Resolve file conflict, shellfuncs is provided by resource-agents


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-12/heartbeat.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- heartbeat.spec	21 Aug 2009 13:48:52 -0000	1.39
+++ heartbeat.spec	16 Oct 2009 07:44:17 -0000	1.40
@@ -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 4
+%global specversion 5
 %global upstreamprefix Linux-HA-Dev-
 %global upstreamversion 0daab7da36a8
 
@@ -15,7 +15,7 @@
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          3.0.0
-Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -136,7 +136,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
-%config(noreplace) %{_sysconfdir}/ha.d/shellfuncs
+%exclude %{_sysconfdir}/ha.d/shellfuncs
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_datadir}/heartbeat/
@@ -176,6 +176,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 15 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.5.0daab7da36a8.hg
+- Resolve file conflict, shellfuncs is provided by resource-agents
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.0-0.4.0daab7da36a8.hg.1
 - rebuilt with new openssl