From dab371101f73da2aa1098e791ec2882193869575 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Tue, 16 Nov 2010 14:35:07 +0100
Subject: [PATCH] Update to 1.1.4 from upstream

---
 .gitignore     |  1 +
 pacemaker.spec | 41 ++++++++++++++++++++++++++---------------
 sources        |  1 +
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d22471e..e7772e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 b3cb4f4a30ae.tar.bz2
+/Pacemaker-1.1.4.tar.bz2
diff --git a/pacemaker.spec b/pacemaker.spec
index f33dd59..3a9ba2e 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,7 +3,7 @@
 %global pcmk_docdir %{_docdir}/%{name}
 
 # Supported cluster stacks, must support at least one
-%bcond_with cman
+%bcond_without cman
 %bcond_without ais
 %bcond_without heartbeat
 
@@ -14,11 +14,14 @@
 # SNMP trap support only works with Net-SNMP 5.4 and above
 %bcond_without snmp
 
+# Support additional trace logging
+%bcond_with tracedata
+
 # We generate some docs using Publican, but its not available everywhere
 %bcond_without publican
 
 %global specversion 1
-%global upstream_version 3f04d59d464c
+%global upstream_version Pacemaker-1.1.4
 %global upstream_prefix Pacemaker-1-1-
 
 # Keep around for when/if required
@@ -36,8 +39,8 @@
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
-Version:	1.1.3
-Release:	%{pcmk_release}.1
+Version:	1.1.4
+Release:	%{pcmk_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -169,16 +172,19 @@ resource health.
 
 %build
 ./autogen.sh
-%{configure}			\
-	%{?_without_heartbeat}	\
-	%{?_without_ais}	\
-	%{?_with_cman}		\
-	%{?_without_esmtp}	\
-	%{?_without_snmp}	\
-	--docdir=%{pcmk_docdir}	\
-	--localstatedir=%{_var}	\
-	--with-initdir=%{_initddir}	\
-	--enable-fatal-warnings=no	\
+%{configure}						\
+	%{!?_with_heartbeat: --without-heartbeat}	\
+	%{!?_with_ais:       --without-ais}		\
+	%{!?_with_esmtp:     --without-esmtp}		\
+	%{!?_with_snmp:      --without-snmp}		\
+	%{?_with_cman:       --with-cman}		\
+	%{?_with_profiling:  --with-profiling}		\
+	%{?_with_gcov:       --with-gcov}		\
+	%{?_with_tracedata   --with-tracedata}		\
+	--docdir=%{pcmk_docdir}				\
+	--localstatedir=%{_var}				\
+	--with-initdir=%{_initddir}			\
+	--enable-fatal-warnings=no			\
 	--disable-ansi
 
 make %{_smp_mflags}
@@ -190,7 +196,7 @@ 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
+# Scripts that should be executable
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
 
@@ -265,6 +271,7 @@ rm -rf %{buildroot}
 
 %doc COPYING
 %doc AUTHORS
+%doc ChangeLog
 
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pengine
@@ -310,6 +317,10 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Mon Nov 15 2010 Andrew Beekhof <andrew@beekhof.net> 1.1.4-1
+- Upstream release of 1.1.4
+- See included ChangeLog file or http://hg.clusterlabs.org/pacemaker/1.1/file/tip/ChangeLog for details
+
 * Wed Sep 29 2010 jkeating - 1.1.3-1.1
 - Rebuilt for gcc bug 634757
 
diff --git a/sources b/sources
index 828ba6f..9e3fb93 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 0009f32bd192a66f0f3a664fa4556c81  3f04d59d464c.tar.bz2
+70cd738910eb657b7d8910edd509ebf5  Pacemaker-1.1.4.tar.bz2