diff --git a/.cvsignore b/.cvsignore index 3bb9055..6d42283 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ ee19d8e83c2a.tar.bz2 +66b7bfd467f3.patch diff --git a/pacemaker.spec b/pacemaker.spec index 1847350..2e1d821 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -4,7 +4,7 @@ %global with_heartbeat_support 1 %global pcmk_docdir %{_docdir}/%{name} -%global specversion 4 +%global specversion 5 %global upstream_version ee19d8e83c2a %global upstream_prefix Pacemaker-1-0- @@ -25,6 +25,8 @@ 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 + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: on Requires(pre): cluster-glue @@ -105,6 +107,7 @@ resource health. %prep %setup -q -n %{upstream_prefix}%{upstream_version} +%patch1 -p1 %build ./autogen.sh @@ -220,6 +223,10 @@ rm -rf %{buildroot} %doc AUTHORS %changelog +* Wed Dec 9 2009 Andrew Beekhof - 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 + * Thu Oct 29 2009 Andrew Beekhof - 1.0.5-4 - Include the fixes from CoroSync integration testing - Move the resource templates - they're not documentation diff --git a/sources b/sources index ec8659a..8269cfb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 277e12a5417ff294b166225f4d7c4648 ee19d8e83c2a.tar.bz2 +de83e10d71d85f06882fe60998d91207 66b7bfd467f3.patch