[pacemaker/f17] Upstream 1.1.7
Andrew Beekhof
beekhof at fedoraproject.org
Thu Mar 29 00:32:15 UTC 2012
commit 19f3b8ac20f8721912071a95dbd6a975a731dda5
Author: Andrew Beekhof <andrew at beekhof.net>
Date: Thu Mar 29 10:46:26 2012 +1100
Upstream 1.1.7
.gitignore | 2 +
pacemaker.spec | 74 +++++++++++++++++++++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 52 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c22daf..1fd5e7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
/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 6162b5e..43532e0 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 7742926
+%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
@@ -22,6 +22,7 @@
%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>"
@@ -29,7 +30,6 @@
# Supported cluster stacks, must support at least one
%bcond_with cman
-%bcond_without doc
%bcond_without corosync
%bcond_with heartbeat
@@ -42,14 +42,11 @@
%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_without publican
+# We generate docs using Publican, Asciidoc and Inkscape, but they're not available everywhere
+%bcond_without doc
# Use a different versioning scheme
-%bcond_without pre_release
+%bcond_with pre_release
%if %{with profiling}
# This disables -debuginfo package creation and also the stripping binaries/libraries
@@ -74,7 +71,6 @@ Group: System Environment/Daemons
# export VER={upstream_version}
# wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER}
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
-Patch1: pacemaker-hotfixes.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on
Requires(pre): cluster-glue
@@ -95,18 +91,46 @@ Provides: heartbeat >= 3.0.4
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
+
+%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 resource-agents libqb-devel
+# 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
@@ -130,14 +154,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
@@ -241,7 +266,6 @@ manager for Linux-HA (Heartbeat) and/or Corosync.
%prep
%setup -q -n %{upstream_prefix}-%{upstream_version}
-%patch1 -p1
# Force the local time
#
@@ -267,17 +291,16 @@ 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
@@ -368,7 +391,6 @@ fi
%exclude %{_sbindir}/crm_uuid
%endif
-%if %{with doc}
%doc %{_mandir}/man7/*
%doc %{_mandir}/man8/attrd_updater.*
%doc %{_mandir}/man8/crm_attribute.*
@@ -377,7 +399,6 @@ fi
%doc %{_mandir}/man8/fence_pcmk.*
%doc %{_mandir}/man8/pacemakerd.*
%doc %{_mandir}/man8/stonith_admin.*
-%endif
%doc COPYING
%doc AUTHORS
@@ -389,6 +410,7 @@ 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
@@ -416,7 +438,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.*
@@ -425,7 +446,6 @@ fi
%exclude %{_mandir}/man8/fence_pcmk.*
%exclude %{_mandir}/man8/pacemakerd.*
%exclude %{_mandir}/man8/stonith_admin.*
-%endif
%doc COPYING
%doc AUTHORS
@@ -474,6 +494,10 @@ fi
%doc AUTHORS
%changelog
+* 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
diff --git a/sources b/sources
index 410e478..fe09050 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5556b11517f5b735659350f3ac9e02de ClusterLabs-pacemaker-7742926.tar.gz
+61076a946cf2ba549dce1458e2ef76e2 ClusterLabs-pacemaker-b5b0a7b.tar.gz
More information about the scm-commits
mailing list