[pacemaker] 1.1.7 pre-release for corosync 2.0

[Andrew Beekhof]

commit f57249ff06f5a1902ab2b3546231167eeb5c1273
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Thu Feb 2 16:36:03 2012 +1100

    1.1.7 pre-release for corosync 2.0

 .gitignore                  |    1 +
 cman-disconnect.patch       |   67 ----------------------------
 cman-dispatch-all.patch     |   20 --------
 cman-fencing-ack.patch      |   31 -------------
 cman-fencing-override.patch |  102 -------------------------------------------
 pacemaker.spec              |   34 ++++++++++-----
 sources                     |    2 +-
 7 files changed, 25 insertions(+), 232 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2628cc..a5c0bd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Pacemaker-1.1.5.tar.bz2
 /Pacemaker-1.1.6.tar.bz2
 /ClusterLabs-pacemaker-89678d4.tar.gz
+/ClusterLabs-pacemaker-bc7c125.tar.gz
diff --git a/pacemaker.spec b/pacemaker.spec
index e24bbf7..a4c285a 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -2,8 +2,8 @@
 %global uname hacluster
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 3
-%global upstream_version 89678d4
+%global specversion 1
+%global upstream_version bc7c125
 %global upstream_prefix ClusterLabs-pacemaker
 
 # Compatibility macros for distros (fedora) that don't provide Python macros by default
@@ -20,12 +20,15 @@
 %{!?with:          %{expand: %%global with()          %%{expand:%%%%{?with_%%{1}:1}%%%%{!?with_%%{1}:0}}}}
 %{!?without:       %{expand: %%global without()       %%{expand:%%%%{?with_%%{1}:0}%%%%{!?with_%%{1}:1}}}}
 
+%global cs_major %(pkg-config corosync --modversion  | awk -F . '{print $1}')
+%global cs_minor %(pkg-config corosync --modversion  | awk -F . '{print $2}')
+
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
 
 # Supported cluster stacks, must support at least one
-%bcond_without cman
+%bcond_with cman
 %bcond_without doc
 %bcond_without corosync
 %bcond_with heartbeat
@@ -46,7 +49,7 @@
 %bcond_without publican
 
 # Use a different versioning scheme
-%bcond_with pre_release
+%bcond_without pre_release
 
 %if %{with profiling}
 # This disables -debuginfo package creation and also the stripping binaries/libraries
@@ -62,8 +65,8 @@
 
 Name:          pacemaker
 Summary:       Scalable High-Availability cluster resource manager
-Version:       1.1.6
-Release:       %{pcmk_release}%{?dist}.1
+Version:       1.1.7
+Release:       %{pcmk_release}%{?dist}
 License:       GPLv2+ and LGPLv2+
 Url:           http://www.clusterlabs.org
 Group:         System Environment/Daemons
@@ -91,7 +94,7 @@ BuildRequires: glib2-devel cluster-glue-libs-devel libxml2-devel libxslt-devel
 BuildRequires: pkgconfig python-devel gcc-c++ bzip2-devel gnutls-devel pam-devel
 
 # Enables optional functionality
-BuildRequires: ncurses-devel openssl-devel libselinux-devel docbook-style-xsl resource-agents
+BuildRequires: ncurses-devel openssl-devel libselinux-devel docbook-style-xsl resource-agents libqb-devel
 
 
 %if %{with cman}
@@ -270,7 +273,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
 
 # Scripts that should be executable
-chmod a+x %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py
+chmod a+x %{buildroot}/%{_libexecdir}/pacemaker/hb2openais-helper.py
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/extracttests.py
 
@@ -285,9 +288,8 @@ find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
 find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
 
 # Do not package these either
-rm -f %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.*
-rm -f %{buildroot}/%{_libdir}/heartbeat/crm_primitive.*
-rm -f %{buildroot}/%{_libdir}/heartbeat/atest
+rm -f %{buildroot}/%{_libexecdir}/pacemaker/hb2openais-helper.*
+rm -f %{buildroot}/%{_libexecdir}/pacemaker/crm_primitive.*
 rm -f %{buildroot}/%{_libdir}/service_crm.so
 
 %if %{with gcov}
@@ -337,6 +339,7 @@ fi
 %{_datadir}/pacemaker
 %{_datadir}/snmp/mibs/PCMK-MIB.txt
 %{_libdir}/heartbeat/*
+%{_libexecdir}/pacemaker/*
 
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_master
@@ -377,8 +380,12 @@ fi
 %dir /usr/lib/ocf/resource.d
 /usr/lib/ocf/resource.d/pacemaker
 %if %{with corosync}
+%if 0%{?cs_major} < 2
+%if 0%{?cs_minor} < 8
 %{_libexecdir}/lcrso/pacemaker.lcrso
 %endif
+%endif
+%endif
 
 %files cli
 %defattr(-,root,root)
@@ -457,6 +464,11 @@ fi
 %doc AUTHORS
 
 %changelog
+* Thu Feb 02 2012 Andrew Beekhof <andrew at beekhof.net> 1.1.7-0.1-bc7c125.git
+- New upstream tarball: bc7c125
+- Pre-release 1.1.7 build to deal with the removal of cman and support for corosync plugins
+- Add libqb as a dependancy
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index a07e799..b5be63f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3f5a66cc7c8f4a3104f66942c14b618  ClusterLabs-pacemaker-89678d4.tar.gz
+693012e4e78f8dd014ce8d99efb97da8  ClusterLabs-pacemaker-bc7c125.tar.gz