[pacemaker/f16] Upstream 1.1.7
Andrew Beekhof
beekhof at fedoraproject.org
Thu Mar 29 00:53:18 UTC 2012
commit 361ee6c6a1a833c1b561cc3a07def40c237a12ec
Author: Andrew Beekhof <andrew at beekhof.net>
Date: Thu Mar 29 11:51:23 2012 +1100
Upstream 1.1.7
.gitignore | 5 +++
pacemaker.spec | 110 +++++++++++++++++++++++++++++++++++++++----------------
sources | 2 +-
3 files changed, 84 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2628cc..1fd5e7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
/Pacemaker-1.1.5.tar.bz2
/Pacemaker-1.1.6.tar.bz2
/ClusterLabs-pacemaker-89678d4.tar.gz
+/ClusterLabs-pacemaker-bc7c125.tar.gz
+/ClusterLabs-pacemaker-148fccf.tar.gz
+/ClusterLabs-pacemaker-7742926.tar.gz
+/ClusterLabs-pacemaker-Pacemaker-1.1.7.tar.gz
+/ClusterLabs-pacemaker-b5b0a7b.tar.gz
diff --git a/pacemaker.spec b/pacemaker.spec
index b52e0b6..1762e86 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -2,8 +2,8 @@
%global uname hacluster
%global pcmk_docdir %{_docdir}/%{name}
-%global specversion 4
-%global upstream_version 89678d4
+%global specversion 1
+%global upstream_version b5b0a7b
%global upstream_prefix ClusterLabs-pacemaker
# Compatibility macros for distros (fedora) that don't provide Python macros by default
@@ -20,13 +20,16 @@
%{!?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}')
+%global rawhide %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?)
+
# 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_without doc
+%bcond_with cman
%bcond_without corosync
%bcond_with heartbeat
@@ -39,11 +42,8 @@
%bcond_with profiling
%bcond_with gcov
-# Support additional trace logging
-%bcond_without tracedata
-
-# We generate some docs using Publican, but its not available everywhere
-%bcond_with publican
+# We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere
+%bcond_without doc
# Use a different versioning scheme
%bcond_with pre_release
@@ -62,7 +62,7 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
-Version: 1.1.6
+Version: 1.1.7
Release: %{pcmk_release}%{?dist}
License: GPLv2+ and LGPLv2+
Url: http://www.clusterlabs.org
@@ -85,18 +85,46 @@ Conflicts: heartbeat < 2.99
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?suse_version}
+# net-snmp-devel on SLES10 does not suck in tcpd-devel automatically
+BuildRequires: tcpd-devel
+# Suse splits this off into a separate package
+Requires: python-curses python-xml
+BuildRequires: python-curses python-xml
+%endif
+
# Required for core functionality
BuildRequires: automake autoconf libtool pkgconfig python libtool-ltdl-devel
BuildRequires: glib2-devel cluster-glue-libs-devel libxml2-devel libxslt-devel
-BuildRequires: pkgconfig python-devel gcc-c++ bzip2-devel gnutls-devel pam-devel
+BuildRequires: pkgconfig python-devel gcc-c++ bzip2-devel pam-devel
-# Enables optional functionality
-BuildRequires: ncurses-devel openssl-devel libselinux-devel docbook-style-xsl resource-agents
+%if 0%{?suse_version} >= 1100
+# Renamed since opensuse-11.0
+BuildRequires: libgnutls-devel
+%else
+BuildRequires: gnutls-devel
+%endif
+# Enables optional functionality
+BuildRequires: ncurses-devel openssl-devel libselinux-devel docbook-style-xsl libqb-devel
+BuildRequires: bison byacc flex help2man
+
%if %{with cman}
+
+%if 0%{?fedora} > 0
+%if 0%{?fedora} < 17
+BuildRequires: clusterlib-devel
+%endif
+%endif
+
+%if 0%{?rhel} > 0
+%if 0%{?rhel} < 7
BuildRequires: clusterlib-devel
%endif
+%endif
+
+%endif
%if %{with esmtp}
BuildRequires: libesmtp-devel
@@ -111,7 +139,7 @@ BuildRequires: net-snmp-devel
%endif
%if %{with corosync}
-# Do not require corosync, the admin should select which stack to use and install it
+Requires: corosync
BuildRequires: corosynclib-devel
%endif
@@ -120,14 +148,15 @@ BuildRequires: corosynclib-devel
BuildRequires: heartbeat-devel heartbeat-libs >= 3.0.0
%endif
-%if %{with doc}
-BuildRequires: asciidoc help2man
+%if !%{rawhide}
+# More often than not, inkscape is busted on rawhide, don't even bother
-%if %{with publican}
+%if %{with doc}
%ifarch %{ix86} x86_64
-BuildRequires: publican inkscape
+BuildRequires: publican inkscape asciidoc
%endif
%endif
+
%endif
%description
@@ -254,23 +283,22 @@ docdir=%{pcmk_docdir} %{configure} \
%{?with_cman: --with-cman} \
%{?with_profiling: --with-profiling} \
%{?with_gcov: --with-gcov} \
- %{?with_tracedata: --with-tracedata} \
--with-initdir=%{_initrddir} \
--localstatedir=%{_var} \
--with-version=%{version}-%{release} \
--enable-fatal-warnings=no
-make %{_smp_mflags} docdir=%{pcmk_docdir}
+make %{_smp_mflags} V=1 docdir=%{pcmk_docdir}
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} install
+make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install
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 +313,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 +364,7 @@ fi
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%{_libdir}/heartbeat/*
+%{_libexecdir}/pacemaker/*
%{_sbindir}/crm_attribute
%{_sbindir}/crm_master
@@ -355,7 +383,6 @@ fi
%exclude %{_sbindir}/crm_uuid
%endif
-%if %{with doc}
%doc %{_mandir}/man7/*
%doc %{_mandir}/man8/attrd_updater.*
%doc %{_mandir}/man8/crm_attribute.*
@@ -364,7 +391,6 @@ fi
%doc %{_mandir}/man8/fence_pcmk.*
%doc %{_mandir}/man8/pacemakerd.*
%doc %{_mandir}/man8/stonith_admin.*
-%endif
%doc COPYING
%doc AUTHORS
@@ -376,9 +402,14 @@ fi
%dir /usr/lib/ocf
%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)
@@ -399,7 +430,6 @@ fi
%{_sbindir}/crm_report
%{_sbindir}/crm_ticket
%{py_sitedir}/crm
-%if %{with doc}
%doc %{_mandir}/man8/*
%exclude %{_mandir}/man8/attrd_updater.*
%exclude %{_mandir}/man8/crm_attribute.*
@@ -408,7 +438,6 @@ fi
%exclude %{_mandir}/man8/fence_pcmk.*
%exclude %{_mandir}/man8/pacemakerd.*
%exclude %{_mandir}/man8/stonith_admin.*
-%endif
%doc COPYING
%doc AUTHORS
@@ -457,10 +486,27 @@ fi
%doc AUTHORS
%changelog
-* Thu Oct 06 2011 Andrew Beekhof <andrew at beekhof.net> 1.1.6-4
-- Disable publican based docs until the inkscape dependancies can be satisfied
+* Wed Mar 28 2012 Andrew Beekhof <andrew at beekhof.net> Pacemaker-1.1.7-1
+- Update source tarball to upstream release: Pacemaker-1.1.7
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for details
+
+* Thu Feb 16 2012 Andrew Beekhof <andrew at beekhof.net> 1.1.7-0.3-7742926.git
+- New upstream tarball: 7742926
+- Additional Provides and Obsoletes directives to enable upgrading from heartbeat
+- Rebuild now that the Corosync CFG API has been removed
+
+* Thu Feb 02 2012 Andrew Beekhof <andrew at beekhof.net> 1.1.7-0.2-bc7c125.git
+- Additional Provides and Obsoletes directives to enable upgrading from rgmanager
+
+* 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
-* Thu Oct 06 2011 Andrew Beekhof <andrew at beekhof.net> 1.1.6-3
+* Mon Sep 26 2011 Andrew Beekhof <andrew at beekhof.net> 1.1.6-3
- New upstream tarball: 89678d4
- Move man pages to the correct subpackages
diff --git a/sources b/sources
index a07e799..fe09050 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3f5a66cc7c8f4a3104f66942c14b618 ClusterLabs-pacemaker-89678d4.tar.gz
+61076a946cf2ba549dce1458e2ef76e2 ClusterLabs-pacemaker-b5b0a7b.tar.gz
More information about the scm-commits
mailing list