Update with the results of CoroSync integration testing

.cvsignore

@@ -1 +1 @@
-462f1569a437.tar.bz2
+ee19d8e83c2a.tar.bz2

pacemaker.spec

@@ -2,26 +2,29 @@
 %global uname hacluster
 %global with_ais_support	1
 %global with_heartbeat_support	1
-# Enable heartbeat support once it builds against cluster-glue
+%global pcmk_docdir %{_docdir}/%{name}
 
-# When downloading directly from Mercurial, it will automatically add this prefix
+%global specversion 4
-# Invoking 'hg archive' wont but you can add one with:
+%global upstream_version ee19d8e83c2a
-# hg archive -t tgz -p "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
+%global upstream_prefix Pacemaker-1-0-
-%global specversion 3
-%global upstreamprefix Pacemaker-1-0-
-%global upstreamversion 462f1569a437
 
 # Keep around for when/if required
-#global alphatag %{upstreamversion}.hg
+#global alphatag %{upstream_version}.hg
+
+%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+
+# When downloading directly from Mercurial, it will automatically add a prefix
+# Invoking 'hg archive' wont but you can add one with:
+# hg archive -t tgz -p "$upstream_prefix-$upstream_version" -r $upstream_version $upstream_version.tar.gz
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{pcmk_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
-Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstreamversion}.tar.bz2
+Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -101,11 +104,11 @@ when related resources fail and can be configured to periodically check
 resource health.
 
 %prep
-%setup -q -n %{upstreamprefix}%{upstreamversion}
+%setup -q -n %{upstream_prefix}%{upstream_version}
 
 %build
 ./autogen.sh
-%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no 
+%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no --docdir=%{pcmk_docdir}
 make %{_smp_mflags}
 
 %install
@@ -144,10 +147,9 @@ rm -rf %{buildroot}
 %files
 ###########################################################
 %defattr(-,root,root)
-%dir %{_datadir}/doc/packages/pacemaker
-%dir %{_datadir}/doc/packages/pacemaker/templates
 
 %{_datadir}/pacemaker
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
 %{_libdir}/heartbeat/*
 %{_sbindir}/cibadmin
 %{_sbindir}/crm_attribute
@@ -173,13 +175,15 @@ rm -rf %{buildroot}
 %exclude %{_sbindir}/crm_uuid
 %endif
 
-%doc %{_datadir}/doc/packages/pacemaker/AUTHORS
+# Packaged elsewhere
-%doc %{_datadir}/doc/packages/pacemaker/README
+%exclude %{pcmk_docdir}/AUTHORS
-%doc %{_datadir}/doc/packages/pacemaker/README.hb2openais
+%exclude %{pcmk_docdir}/COPYING
-%doc %{_datadir}/doc/packages/pacemaker/COPYING
+%exclude %{pcmk_docdir}/COPYING.LIB
-%doc %{_datadir}/doc/packages/pacemaker/COPYING.LGPL
+
-%doc %{_datadir}/doc/packages/pacemaker/crm_cli.txt
+%exclude %{pcmk_docdir}/index.html
-%doc %{_datadir}/doc/packages/pacemaker/templates/*
+%doc %{pcmk_docdir}/crm_cli.txt
+%doc %{pcmk_docdir}/crm_fencing.txt
+%doc %{pcmk_docdir}/README.hb2openais
 %doc %{_mandir}/man8/*.8*
 %doc COPYING
 %doc AUTHORS
@@ -216,6 +220,45 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Thu Oct 29 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.5-4
+- Include the fixes from CoroSync integration testing
+- Move the resource templates - they're not documentation
+- Ensure documentation is placed in a standard location
+- Exclude documentation that is included elsewhere in the package
+
+- Update the tarball from upstream to version ee19d8e83c2a
+  + High: cib: Correctly clean up when both plaintext and tls remote ports are requested
+  + High: PE: Bug bnc#515172 - Provide better defaults for lt(e) and gt(e) comparisions
+  + High: PE: Bug lf#2197 - Allow master instances placemaker to be influenced by colocation constraints
+  + High: PE: Make sure promote/demote pseudo actions are created correctly
+  + High: PE: Prevent target-role from promoting more than master-max instances
+  + High: ais: Bug lf#2199 - Prevent expected-quorum-votes from being populated with garbage
+  + High: ais: Prevent deadlock - dont try to release IPC message if the connection failed
+  + High: cib: For validation errors, send back the full CIB so the client can display the errors
+  + High: cib: Prevent use-after-free for remote plaintext connections
+  + High: crmd: Bug lf#2201 - Prevent use-of-NULL when running heartbeat
+  + High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled
+  + High: PE: Bug lf#2106 - Not all anonymous clone children are restarted after configuration change
+  + High: PE: Bug lf#2170 - stop-all-resources option had no effect
+  + High: PE: Bug lf#2171 - Prevent groups from starting if they depend on a complex resource which can't
+  + High: PE: Disable resource management if stonith-enabled=true and no stonith resources are defined
+  + High: PE: Don't include master score if it would prevent allocation
+  + High: ais: Avoid excessive load by checking for dead children every 1s (instead of 100ms)
+  + High: ais: Bug rh#525589 - Prevent shutdown deadlocks when running on CoroSync
+  + High: ais: Gracefully handle changes to the AIS nodeid
+  + High: crmd: Bug bnc#527530 - Wait for the transition to complete before leaving S_TRANSITION_ENGINE
+  + High: crmd: Prevent use-after-free with LOG_DEBUG_3
+  + Medium: xml: Mask the "symmetrical" attribute on rsc_colocation constraints (bnc#540672)
+  + Medium (bnc#520707): Tools: crm: new templates ocfs2 and clvm
+  + Medium: Build: Invert the disable ais/heartbeat logic so that --without (ais|heartbeat) is available to rpmbuild
+  + Medium: PE: Bug lf#2178 - Indicate unmanaged clones
+  + Medium: PE: Bug lf#2180 - Include node information for all failed ops
+  + Medium: PE: Bug lf#2189 - Incorrect error message when unpacking simple ordering constraint
+  + Medium: PE: Correctly log resources that would like to start but can't
+  + Medium: PE: Stop ptest from logging to syslog
+  + Medium: ais: Include version details in plugin name
+  + Medium: crmd: Requery the resource metadata after every start operation
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.0.5-3
 - rebuilt with new net-snmp
 

sources

@@ -1 +1 @@
-2206d439eccd8794353ee798849f448d  462f1569a437.tar.bz2
+277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2