From d2ea9261d3c33e7ac7e76f2b7b895c09df6c6613 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <beekhof@fedoraproject.org>
Date: Thu, 11 Feb 2010 10:57:32 +0000
Subject: [PATCH] Update with 1.1.1 from upstream

---
 .cvsignore     |  3 +--
 pacemaker.spec | 29 ++++++++++++++++-------------
 sources        |  3 +--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6d42283..4ac2882 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-ee19d8e83c2a.tar.bz2
-66b7bfd467f3.patch
+60b7753f7310.tar.bz2
diff --git a/pacemaker.spec b/pacemaker.spec
index 2e1d821..6ed31a3 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -4,12 +4,12 @@
 %global with_heartbeat_support	1
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 5
-%global upstream_version ee19d8e83c2a
-%global upstream_prefix Pacemaker-1-0-
+%global specversion 1
+%global upstream_version 60b7753f7310
+%global upstream_prefix Pacemaker-Devel-
 
 # 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}
 
@@ -19,13 +19,12 @@
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
-Version:	1.0.5
+Version:	1.1.1
 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/%{upstream_version}.tar.bz2
-Patch1:		66b7bfd467f3.patch
+Source0:	http://hg.clusterlabs.org/pacemaker/devel/archive/%{upstream_version}.tar.bz2
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
@@ -107,7 +106,6 @@ resource health.
 
 %prep
 %setup -q -n %{upstream_prefix}%{upstream_version}
-%patch1 -p1
 
 %build
 ./autogen.sh
@@ -120,9 +118,9 @@ make install DESTDIR=%{buildroot}
 
 # Scripts that need should be executable
 chmod a+x %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py
-chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/CTSlab.py
-chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/OCFIPraTest.py
-chmod a+x %{buildroot}/%{_datadir}/pacemaker/cts/extracttests.py
+chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
+chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/OCFIPraTest.py
+chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
 
 # These are not actually scripts
 find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
@@ -171,6 +169,9 @@ rm -rf %{buildroot}
 %{_sbindir}/crm_shadow
 %{_sbindir}/cibpipe
 %{_sbindir}/crm_node
+%{_sbindir}/crm_simulate
+%{_sbindir}/fence_legacy
+%{_sbindir}/stonith_admin
 
 %if %with_heartbeat_support
 %{_sbindir}/crm_uuid
@@ -183,7 +184,6 @@ rm -rf %{buildroot}
 %exclude %{pcmk_docdir}/COPYING
 %exclude %{pcmk_docdir}/COPYING.LIB
 
-%exclude %{pcmk_docdir}/index.html
 %doc %{pcmk_docdir}/crm_cli.txt
 %doc %{pcmk_docdir}/crm_fencing.txt
 %doc %{pcmk_docdir}/README.hb2openais
@@ -217,12 +217,15 @@ rm -rf %{buildroot}
 %files -n pacemaker-libs-devel
 %defattr(-,root,root)
 %{_includedir}/pacemaker
-%{_includedir}/heartbeat/fencing
 %{_libdir}/*.so
 %doc COPYING.LIB
 %doc AUTHORS
 
 %changelog
+* Thu Feb 11 2010 Andrew Beekhof <andrew@beekhof.net> - 1.1.1-0.1-60b7753f7310.hg
+- Update the tarball from upstream to version 60b7753f7310
+  + First public release of the 1.1 series
+
 * Wed Dec 9 2009 Andrew Beekhof <andrew@beekhof.net> - 1.0.5-5
 - Include patch of changeset 66b7bfd467f3:
   Some clients such as gfs_controld want a cluster name, allow one to be specified in corosync.conf
diff --git a/sources b/sources
index 8269cfb..b113ecf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2
-de83e10d71d85f06882fe60998d91207  66b7bfd467f3.patch
+6f8c608f8f743d7e3e5fbfae57572850  60b7753f7310.tar.bz2