- RA: add NodeUtilization

- stonith-ng: export stonith resource name to stonith agents
- crmd: Send out all of the meta parameters to lrmd for stop action
- RA: Fix the metadata of HealthSMART and SysInfo RAs
- stonith: Longer default timeout/interval of operations for stonith
  resources
- Doc: many proof-reading improvements
- stonith: Fix the stonith timeout issue (cl#5009, bnc#727498)
- update the license information in pacemaker.spec (bnc#726795)
- xml: Add rsc_ticket support into "pacemaker-1.2" schema
- xml: Add resource template support into "pacemaker-1.2" schema 
- tools: Avoid problems caused by differences between node name and
  uname -n
- PE: Resolve memory leak when retrieving failure counts
- Stonith: Implement a manual override for when nodes are known to be
  safely off
- PE: Implement limit number of concurrent live migrations (FATE#310118)
- PE: Implement referencing templates in constraints
- PE: Move master based on failure of colocated group
- Fencing: Support admin configurable timeouts for API operations
- Fencing: Support checking in-progress operations for all nodes
- don't package crm shell code
- add Requires: crmsh
- Build man pages and html versions (bnc#723680)
- Shell: template support
- Upstream version cs: b988976485d15cb702c9307df55512d323831a5e

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=24
This commit is contained in:
2011-12-16 04:55:14 +00:00
committed by Git OBS Bridge
parent ae7fb67b9e
commit 1d92dc70ad
30 changed files with 533 additions and 5089 deletions

View File

@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%global pcmk_docdir %{_docdir}/%{name}
%if 0%{?suse_version}
%define _libexecdir %{_libdir}
@@ -38,48 +36,51 @@
Name: pacemaker
Summary: The Pacemaker scalable High-Availability cluster resource manager
License: GPL-2.0+ ; LGPL-2.1+
Group: Productivity/Clustering/HA
Version: 1.1.6
Release: 0
License: GPL-2.0+ ; LGPL-2.1+
Url: http://www.clusterlabs.org
Group: Productivity/Clustering/HA
Source: pacemaker.tar.bz2
Source2: %{doc_pkg}.tar.gz
Source100: pacemaker.rpmlintrc
Patch1: pacemaker-cts-startcmd.patch
Patch2: acl_fix_d44ff2711662.patch
Patch10: crm_history.patch
Patch11: crm_history_peinputs.patch
Patch12: crm_history_pssh.patch
Patch13: crm_history_1_d0359dca5dba.patch
Patch14: crm_history_2_29fd4f04c01f.patch
Patch15: crm_history_3_b3a014c0f85b.patch
Patch16: crm_history_4_a09974a06cdf.patch
Patch17: crm_history_5_c3068d22de72.patch
Patch18: crm_history-fix-hb_report-limit.patch
Patch19: crm_history_6_441f4448eba6.patch
Patch20: crm_history_7_3f3c348aaaed.patch
Patch21: crm_history_8_3681d3471fde.patch
Patch22: crm_path_bnc712605.patch
Patch23: crm_deleteunmanaged.patch
Patch24: crm_lrmsecrets_3a81b7eae666.patch
Patch25: crm_history_9_709ef91cfada.patch
Patch26: crm_history_10_d21f988a419c.patch
Patch27: crm_history_11_ccd0c1e1edf9.patch
Patch28: crm_pager_f77e52725f2d.patch
Patch29: crm_tickets_825cb3e79d7b.patch
Patch30: crm_site_9b07d41c73b4.patch
Patch2: rm_crmsh.patch
Patch3: pacemaker-rsc_ticket-schema.diff
Patch4: pacemaker-template-schema.diff
Patch5: bug-728579_pacemaker-stonith-dev-id.diff
Patch6: pacemaker-NodeUtilization-RA.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Conflicts: heartbeat < 3.0
# We need libglue2, not libheartbeat2
Conflicts: libheartbeat2 < 3.0.0
PreReq: cluster-glue >= 1.0.6
Requires: resource-agents openais python python-xml
Requires: libpacemaker3 = %{version}-%{release} python-curses
BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libesmtp-devel libglue-devel libtool libxml2-devel libxslt-devel ncurses-devel net-snmp-devel pam-devel pkgconfig python-devel resource-agents swig
Requires: crmsh
BuildRequires: asciidoc
BuildRequires: e2fsprogs-devel
BuildRequires: glib2-devel
BuildRequires: gnutls-devel
BuildRequires: libesmtp-devel
BuildRequires: libglue-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: ncurses-devel
BuildRequires: net-snmp-devel
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: resource-agents
BuildRequires: swig
%if %with_regression_tests
BuildRequires: openais procps python python-curses python-xml vim-base
BuildRequires: openais
BuildRequires: procps
BuildRequires: python
BuildRequires: python-curses
BuildRequires: python-xml
BuildRequires: vim-base
%endif
%if %with_ais_support
BuildRequires: libcorosync-devel
@@ -93,7 +94,6 @@ Requires: heartbeat
BuildRequires: libbz2-devel
Suggests: graphviz
Recommends: libdlm resource-agents
Recommends: python-pssh
%if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets
%endif
@@ -123,8 +123,8 @@ Authors:
Andrew Beekhof <abeekhof@suse.de>
%package -n libpacemaker3
License: GPL-2.0+ ; LGPL-2.1+
Summary: The Pacemaker scalable High-Availability cluster resource manager
License: GPL-2.0+ ; LGPL-2.1+
Group: Productivity/Clustering/HA
%description -n libpacemaker3
@@ -145,8 +145,8 @@ Authors:
Andrew Beekhof <abeekhof@suse.de>
%package -n libpacemaker-devel
License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Summary: The Pacemaker scalable High-Availability cluster resource manager
License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
Requires: libpacemaker3 = %{version}-%{release}
@@ -179,28 +179,11 @@ Authors:
###########################################################
%setup -a 2 -n pacemaker -q
%patch1 -p1
%patch2 -p1 -R
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
###########################################################
%build
@@ -241,6 +224,10 @@ rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so
# Don't want to ship this just yet:
rm $RPM_BUILD_ROOT/etc/init.d/pacemaker || true
rm $RPM_BUILD_ROOT/usr/sbin/pacemaker{d,} || true
rm $RPM_BUILD_ROOT/usr/bin/ccs2cib || true
rm $RPM_BUILD_ROOT/usr/bin/ccs_flatten || true
rm $RPM_BUILD_ROOT/usr/bin/disable_rgmanager || true
rm $RPM_BUILD_ROOT/usr/sbin/fence_pcmk || true
%if %with_gcov
GCOV_BASE=$RPM_BUILD_ROOT/%{_var}/lib/pacemaker/gcov
@@ -312,7 +299,6 @@ fi
%{_sbindir}/crm_failcount
%{_sbindir}/crm_master
%{_sbindir}/crm_mon
%{_sbindir}/crm
%{_sbindir}/crm_resource
%{_sbindir}/crm_report
%{_sbindir}/crm_standby
@@ -328,7 +314,6 @@ fi
%{_sbindir}/crm_simulate
%{_sbindir}/fence_legacy
%{_sbindir}/stonith_admin
%{py_sitedir}/crm
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pengine
@@ -353,8 +338,7 @@ fi
%exclude %{pcmk_docdir}/COPYING
%exclude %{pcmk_docdir}/COPYING.LIB
%exclude %{_libdir}/pkgconfig
%doc %{pcmk_docdir}
# %doc %{pcmk_docdir}/*.html
%doc %{pcmk_docdir}/*.html
%doc %{_mandir}/man8/*.8*
%doc %{_mandir}/man7/*.7*
%doc %{pcmk_docdir}/README.hb2openais