diff --git a/pacemaker.spec b/pacemaker.spec index ca0994c..6a5f9bd 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -3,6 +3,7 @@ %global pcmk_docdir %{_docdir}/%{name} # Supported cluster stacks, must support at least one +%bcond_with cman %bcond_without ais %bcond_without heartbeat @@ -16,21 +17,21 @@ # We generate some docs using Publican, but its not available everywhere %bcond_without publican -%global specversion 5 -%global upstream_version Pacemaker-1.1.2 +%global specversion 1 +%global upstream_version b3cb4f4a30ae %global upstream_prefix Pacemaker-1-1- # Keep around for when/if required -#global alphatag %{upstream_version}.hg +%global alphatag %{upstream_version}.hg %global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist} # Compatibility macros for distros that don't provide Python macros by default. # Do this instead of trying to conditionally include -# %{_rpmconfigdir}/macros.python which doesn't always exist +# {_rpmconfigdir}/macros.python which doesn't always exist %{!?py_ver: %{expand: %%global py_ver %%(echo `python -c "import sys; print sys.version[:3]"`)}} %{!?py_prefix: %{expand: %%global py_prefix %%(echo `python -c "import sys; print sys.prefix"`)}} -%{!?py_libdir: %{expand: %%global py_libdir %%{expand:%%%%{py_prefix}/lib/python%%%%{py_ver}}}} +%{!?py_libdir: %{expand: %%global py_libdir %%{expand:%%%%{py_prefix}/%%%%{_lib}/python%%%%{py_ver}}}} %{!?py_sitedir: %{expand: %%global py_sitedir %%{expand:%%%%{py_libdir}/site-packages}}} # When downloading directly from Mercurial, it will automatically add a prefix @@ -39,14 +40,12 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager -Version: 1.1.2 -Release: %{pcmk_release}.1 +Version: 1.1.3 +Release: %{pcmk_release} License: GPLv2+ and LGPLv2+ Url: http://www.clusterlabs.org Group: System Environment/Daemons Source0: http://hg.clusterlabs.org/pacemaker/1.1/archive/%{upstream_version}.tar.bz2 -Patch1: bug-lf-2401.patch -Patch2: doc-validation.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: on Requires(pre): cluster-glue @@ -74,6 +73,10 @@ Requires: net-snmp >= 5.4 BuildRequires: corosynclib-devel %endif +%if %{with cman} +BuildRequires: clusterlib-devel +%endif + %if %{with heartbeat} BuildRequires: heartbeat-devel heartbeat-libs %endif @@ -167,20 +170,20 @@ resource health. %prep %setup -q -n %{upstream_prefix}%{upstream_version} -%patch1 -p1 -%patch2 -p0 %build ./autogen.sh %{configure} \ %{?_without_heartbeat} \ %{?_without_ais} \ + %{?_with_cman} \ %{?_without_esmtp} \ %{?_without_snmp} \ - --disable-ansi \ --docdir=%{pcmk_docdir} \ --localstatedir=%{_var} \ - --enable-fatal-warnings=no + --with-initdir=%{_initddir} \ + --enable-fatal-warnings=no \ + --disable-ansi make %{_smp_mflags} @@ -203,8 +206,8 @@ find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f # Don't package these either -rm -f %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.py -rm -f %{buildroot}/%{_libdir}/heartbeat/crm_primitive.py +rm -f %{buildroot}/%{_libdir}/heartbeat/hb2openais-helper.* +rm -f %{buildroot}/%{_libdir}/heartbeat/crm_primitive.* rm -f %{buildroot}/%{_libdir}/service_crm.so rm -f %{buildroot}/usr/lib/ocf/resource.d/pacemaker/pingd @@ -221,6 +224,9 @@ rm -rf %{buildroot} %exclude %{_datadir}/pacemaker/tests +%{_initddir}/pacemaker +%{_sbindir}/pacemakerd + %{_datadir}/pacemaker %{_datadir}/snmp/mibs/PCMK-MIB.txt %{_libdir}/heartbeat/* @@ -246,7 +252,6 @@ rm -rf %{buildroot} %{_sbindir}/fence_legacy %{_sbindir}/stonith_admin %{py_sitedir}/crm -#%{_mandir}/man8/*.8* %{_mandir} %if %{with heartbeat} @@ -305,6 +310,67 @@ rm -rf %{buildroot} %doc AUTHORS %changelog +* Mon Jul 26 2010 Andrew Beekhof - 1.1.3-0.1-b3cb4f4a30ae.hg +- Pre-release version of 1.1.3 + + High: ais: Bug lf2401 - Improved processing when the peer crmd processes join/leave + + High: ais: fix list of active processes sent to clients (bnc#603685) + + High: ais: Move the code for finding uid before the fork so that the child does no logging + + High: ais: Resolve coverity CONSTANT_EXPRESSION_RESULT defects + + High: cib: Also free query result for xpath operations that return more than one hit + + High: cib: Attempt to resolve memory corruption when forking a child to write the cib to disk + + High: cib: Correctly free memory when writing out the cib to disk + + High: cib: Fix the application of unversioned diffs + + High: cib: Remove old developmental error logging + + High: cib: Restructure the 'valid peer' check for deciding which instructions to ignore + + High: Core: Bug lf#2401 - Backed out changeset 6e6980376f01 + + High: Core: Correctly unpack HA_Messages containing multiple entries with the same name + + High: Core: crm_count_member() should only track nodes that have the full stack up + + High: Core: New developmental logging system inspired by the kernel and a PoC from Lars Ellenberg + + High: crmd: All nodes should see status updates, not just he DC + + High: crmd: Allow non-DC nodes to clear failcounts too + + High: crmd: Base DC election on process relative uptime + + High: crmd: Bug lf#2439 - cancel_op() can also return HA_RSCBUSY + + High: crmd: Bug lf#2439 - Handle asynchronous notification of resource deletion events + + High: crmd: Fix assertion failure when performing async resource failures + + High: crmd: Fix handling of async resource deletion results + + High: crmd: Include the action for crm graph operations + + High: crmd: Make sure the membership cache is accurate after a sucessful fencing operation + + High: crmd: Make sure we always poke the FSA after a transition to clear any TE_HALT actions + + High: crmd: Offer crm-level membership once the peer starts the crmd process + + High: crmd: Only need to request quorum update for plugin based clusters + + High: crmd: Prevent everyone from loosing DC elections by correctly initializing all relevant variables + + High: crmd: Prevent segmentation fault + + High: crmd: several fixes for async resource delete + + High: mcp: Add missing headers when built without heartbeat support + + High: mcp: New master control process for (re)spawning pacemaker daemons + + High: PE: Avoid creating invalid ordering constraints for probes that are not needed + + High: PE: Bug lf#1959 - Fail unmanaged resources should not prevent other services from shutting down + + High: PE: Bug lf#2422 - Ordering dependencies on partially active groups not observed properly + + High: PE: Bug lf#2424 - Use notify oepration definition if it exists in the configuration + + High: PE: Bug lf#2433 - No services should be stopped until probes finish + + High: PE: Bug lf#2453 - Enforce clone ordering in the absense of colocation constraints + + High: PE: Correctly detect when there is a real failcount that expired and needs to be cleared + + High: PE: Correctly handle pseudo action creation + + High: PE: Correctly order clone startup after group/clone start + + High: PE: Fix colocation for interleaved clones + + High: PE: Fix colocation with partially active groups + + High: PE: Fix potential use-after-free defect from coverity + + High: PE: Fix previous merge + + High: PE: Fix use-after-free in order_actions() reported by valgrind + + High: PE: Prevent endless loop when looking for operation definitions in the configuration + + High: Resolve coverity RESOURCE_LEAK defects + + High: Shell: Complete the transition to using crm_attribute instead of crm_failcount and crm_standby + + High: stonith: Advertise stonith-ng options in the metadata + + High: stonith: Correctly parse pcmk_host_list parameters that appear on a single line + + High: stonith: Map poweron/poweroff back to on/off expected by the stonith tool from cluster-glue + + High: stonith: pass the configuration to the stonith program via environment variables (bnc#620781) + + High: Support starting plugin-based Pacemaker clusters with the MCP as well + + High: tools: crm_report - corosync.conf wont necessarily contain the text 'pacemaker' anymore + + High: tools: crm_simulate - Resolve coverity USE_AFTER_FREE defect + + High: Tools: Drop the 'pingd' daemon and resource agent in favor of ocf:pacemaker:ping + + High: Tools: Fix recently introduced use-of-NULL + + High: Tools: Fix use-after-free defect from coverity + * Wed Jul 21 2010 David Malcolm - 1.1.2-5.1 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild