[pacemaker] Latest 1.1 release from upstream

[Andrew Beekhof]

commit 1444b5310d087caee2cc8847e85a4b6e325c8644
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Wed Sep 22 22:06:44 2010 +0200

    Latest 1.1 release from upstream

 pacemaker.spec |   32 ++++++++++++++++++++++++++------
 sources        |    2 +-
 2 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 6a5f9bd..e59f525 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -18,11 +18,11 @@
 %bcond_without publican
 
 %global specversion 1
-%global upstream_version b3cb4f4a30ae
+%global upstream_version 3f04d59d464c
 %global upstream_prefix Pacemaker-1-1-
 
 # Keep around for when/if required
-%global alphatag %{upstream_version}.hg
+#global alphatag %{upstream_version}.hg
 
 %global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 
@@ -34,10 +34,6 @@
 %{!?py_libdir:	%{expand: %%global py_libdir   %%{expand:%%%%{py_prefix}/%%%%{_lib}/python%%%%{py_ver}}}}
 %{!?py_sitedir: %{expand: %%global py_sitedir %%{expand:%%%%{py_libdir}/site-packages}}}
 
-# 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.1.3
@@ -191,6 +187,9 @@ make %{_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
+
 # Scripts that need should be executable
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
@@ -224,6 +223,7 @@ rm -rf %{buildroot}
 
 %exclude %{_datadir}/pacemaker/tests
 
+%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
 %{_initddir}/pacemaker
 %{_sbindir}/pacemakerd
 
@@ -310,6 +310,26 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Thu Sep 21 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.3-1
+- Upstream release of 1.1.3
+  + High: crmd: Use the correct define/size for lrm resource IDs
+  + High: crmd: Bug lf#2458 - Ensure stop actions always have the relevant resource attributes
+  + High: crmd: Ensure we activate the DC timer if we detect an alternate DC
+  + High: mcp: Correctly initialize the string containing the list of active daemons
+  + High: mcp: Fix the expansion of the pid file in the init script
+  + High: mcp: Tell chkconfig we need to shut down early on
+  + High: PE: Bug lf#2476 - Repair on-fail=block for groups and primitive resources
+  + High: PE: Do not demote resources because something that requires it can't run
+  + High: PE: Rewrite the ordering constraint logic to be simplicity, clarity and maintainability
+  + High: PE: Wait until stonith is available, don't fall back to shutdown for nodes requesting termination
+  + High: PE: Prevent segfault by ensuring the arguments to do_calculations() are initialized
+  + High: stonith: Bug lf#2461 - Prevent segfault by not looking up operations if the hashtable hasn't been initialized yet
+  + High: Stonith: Bug lf#2473 - Ensure stonith operations complete within the timeout and are terminated if they run too long
+  + High: stonith: Bug lf#2473 - Gracefully handle remote operations that arrive late (after we've done notifications)
+  + High: stonith: Bug lf#2473 - Add the timeout at the top level where the daemon is looking for it
+  + High: stonith: Bug lf#2473 - Ensure timeouts are included for fencing operations
+  + High: Stonith: Use the timeout specified by the user
+  + High: Tools: Bug lf#2456 - Fix assertion failure in crm_resource
 * Mon Jul 26 2010 Andrew Beekhof <andrew at beekhof.net> - 1.1.3-0.1-b3cb4f4a30ae.hg
 - Pre-release version of 1.1.3
   + High: ais: Bug lf2401 - Improved processing when the peer crmd processes join/leave
diff --git a/sources b/sources
index 3815dcb..828ba6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a729f6799a932b27b8a4fab3f982d2b  b3cb4f4a30ae.tar.bz2
+0009f32bd192a66f0f3a664fa4556c81  3f04d59d464c.tar.bz2