From 3cc695571a9a000a9f57e44e84c1d96620ecbd8f8593f20647e8bbf56263b0f8 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Wed, 4 May 2016 12:55:51 +0000 Subject: [PATCH] Accepting request 393641 from home:yan_gao:branches:network:ha-clustering:Factory:Test - Rebase: * pacemaker-Wno-format-signedness.patch - RA: SysInfo - Reset the node attribute "#health_disk" to "green" when there's sufficient free disk (bsc#975079) - pengine: Organize order of actions for slave resources in anti-colocations (bsc#977800) - attrd: Fix the synchronization of attributes (bsc#977846) - pengine: Organize order of actions for master resources in anti-colocations (bsc#977800) - pengine: Respect asymmetrical ordering when trying to move resources (bsc#977675) - fencing: Record the last known names of nodes to make sure fencing requested with nodeid works (bsc#974108) - crmd: first implementation of integrated multi-agent, multi-target alerting mechanism - ping resource: Use fping6 for IPv6 hosts (bsc#976271) - pengine: Consider resource failed if any of the configured monitor operations failed (bsc#972187) - ping resource: avoid undefined func w/ OCF_FUNCTIONS=/dev/null - spec: make Publican docs not depend on pre-existing packages - cib/fencing: Set status callback before connecting to cluster (bsc#974108) - xml: use spaces instead of tabs in schema files - extra: Support of the dampen change by RA. - Upstream version cs: 9e382568ac3cd54c222496501088ab3fc158b2e2 OBS-URL: https://build.opensuse.org/request/show/393641 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=242 --- _service | 2 +- pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 | 3 -- pacemaker-1.1.14+git20160503.9e38256.tar.bz2 | 3 ++ pacemaker-Wno-format-signedness.patch | 30 ++++++++++++-------- pacemaker.changes | 22 ++++++++++++++ pacemaker.spec | 30 ++++++++++++++++---- 6 files changed, 68 insertions(+), 22 deletions(-) delete mode 100644 pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 create mode 100644 pacemaker-1.1.14+git20160503.9e38256.tar.bz2 diff --git a/_service b/_service index 83e65c4..77fc896 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.14 --> 1.1.14+git%cd.%h - 5a6cdd11b4f93b4d55e1b2654078018c339931d4 + 9e382568ac3cd54c222496501088ab3fc158b2e2 diff --git a/pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 b/pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 deleted file mode 100644 index bdd7c0f..0000000 --- a/pacemaker-1.1.14+git20160324.5a6cdd1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6ee4ab1f2cc8779a00389577007792b52e38a0dd326538322fd844554278d61 -size 3770202 diff --git a/pacemaker-1.1.14+git20160503.9e38256.tar.bz2 b/pacemaker-1.1.14+git20160503.9e38256.tar.bz2 new file mode 100644 index 0000000..33cb5b8 --- /dev/null +++ b/pacemaker-1.1.14+git20160503.9e38256.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f9efc1ed281dd8911aca9073cda8e521571be20152693413ca0d1c5aa7851db +size 3815605 diff --git a/pacemaker-Wno-format-signedness.patch b/pacemaker-Wno-format-signedness.patch index bd2f894..7e686fe 100644 --- a/pacemaker-Wno-format-signedness.patch +++ b/pacemaker-Wno-format-signedness.patch @@ -1,13 +1,19 @@ -Index: pacemaker-1.1.12.git20150129.3021d73/configure.ac +Index: pacemaker-1.1.14+git20160503.9e38256/configure.ac =================================================================== ---- pacemaker-1.1.12.git20150129.3021d73.orig/configure.ac 2015-02-24 13:22:11.748602751 +0100 -+++ pacemaker-1.1.12.git20150129.3021d73/configure.ac 2015-02-24 13:22:29.684800783 +0100 -@@ -1708,7 +1708,7 @@ else - -Wdeclaration-after-statement - -Wendif-labels - -Wfloat-equal -- -Wformat=2 -+ -Wformat=2 -Wno-format-signedness - -Wformat-security - -Wformat-nonliteral - -Wmissing-prototypes +--- pacemaker-1.1.14+git20160503.9e38256.orig/configure.ac ++++ pacemaker-1.1.14+git20160503.9e38256/configure.ac +@@ -1792,12 +1792,12 @@ dnl otherwise none of both + AC_DEFINE([GCC_FORMAT_NONLITERAL_CHECKING_ENABLED], [], + [gcc can complain about nonliterals in format]) + EXTRA_FLAGS="$EXTRA_FLAGS +- -Wformat=2 ++ -Wformat=2 -Wno-format-signedness + -Wformat-nonliteral" + else + if test "x$gcc_format_nonliteral" = "xyes"; then + EXTRA_FLAGS="$EXTRA_FLAGS +- -Wformat=2" ++ -Wformat=2 -Wno-format-signedness" + fi + fi + diff --git a/pacemaker.changes b/pacemaker.changes index 9954985..c0a08f1 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed May 4 10:38:16 UTC 2016 - ygao@suse.com + +- Rebase: + * pacemaker-Wno-format-signedness.patch + +- RA: SysInfo - Reset the node attribute "#health_disk" to "green" when there's sufficient free disk (bsc#975079) +- pengine: Organize order of actions for slave resources in anti-colocations (bsc#977800) +- attrd: Fix the synchronization of attributes (bsc#977846) +- pengine: Organize order of actions for master resources in anti-colocations (bsc#977800) +- pengine: Respect asymmetrical ordering when trying to move resources (bsc#977675) +- fencing: Record the last known names of nodes to make sure fencing requested with nodeid works (bsc#974108) +- crmd: first implementation of integrated multi-agent, multi-target alerting mechanism +- ping resource: Use fping6 for IPv6 hosts (bsc#976271) +- pengine: Consider resource failed if any of the configured monitor operations failed (bsc#972187) +- ping resource: avoid undefined func w/ OCF_FUNCTIONS=/dev/null +- spec: make Publican docs not depend on pre-existing packages +- cib/fencing: Set status callback before connecting to cluster (bsc#974108) +- xml: use spaces instead of tabs in schema files +- extra: Support of the dampen change by RA. +- Upstream version cs: 9e382568ac3cd54c222496501088ab3fc158b2e2 + ------------------------------------------------------------------- Thu Mar 24 17:26:44 UTC 2016 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index c245c9f..e82ebfb 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -21,17 +21,26 @@ %global pcmk_docdir %{_docdir}/%{name} %global specversion 1 +%global pcmkversion 1.1.14+git20160503.9e38256 +# set following to the actual commit or, for final release, concatenate +# "pcmkversion" macro to "Pacemaker-" (will yield a tag per the convention) %global commit HEAD -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global lparen ( +%global rparen ) +%global shortcommit %(c=%{commit}; case ${c} in + Pacemaker-*%{rparen} echo ${c:10};; + *%{rparen} echo ${c:0:7};; esac) +%global pre_release %(s=%{shortcommit}; [ ${s: -4:3} != -rc ]; echo $?) +%global post_release %([ %{commit} = Pacemaker-%{shortcommit} ]; echo $?) %global github_owner ClusterLabs # Turn off the auto compilation of python files not in the site-packages directory # Needed so that the -devel package is multilib compliant %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -#%%global rawhide %%(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?) +#%global rawhide %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?) %global rawhide 0 -#%%global cs_version %%(pkg-config corosync --modversion | awk -F . '{print $1}') +#%global cs_version %(pkg-config corosync --modversion | awk -F . '{print $1}') %global cs_version 2 # It has to be eventually decided whether to use Python2 or Python3 %global py_site %{?python_sitearch}%{!?python_sitearch:%(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -72,11 +81,19 @@ %global debug_package %{nil} %endif -%if %{with pre_release} +%if %{with pre_release} || 0%{pre_release} +%if 0%{pre_release} +%global pcmk_release 0.%{specversion}.%(s=%{shortcommit}; echo ${s: -3}) +%else %global pcmk_release 0.%{specversion}.%{shortcommit}.git +%endif +%else +%if 0%{post_release} +%global pcmk_release %{specversion}.%{shortcommit}.git %else %global pcmk_release %{specversion} %endif +%endif #%if 0%{?suse_version} #%define _libexecdir %{_libdir} @@ -110,12 +127,12 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause %endif # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary Group: Productivity/Clustering/HA -Version: 1.1.14+git20160324.5a6cdd1 +Version: %{pcmkversion} Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org -#Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +#Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source0: %{name}-%{version}.tar.bz2 Source1: crm_report.in Source100: pacemaker.rpmlintrc @@ -459,6 +476,7 @@ docdir=%{pcmk_docdir} %{configure} \ %if !%enable_fatal_warnings --enable-fatal-warnings=no \ %endif + %{!?with_doc: --with-brand=} \ --with-initdir=%{_initrddir} \ --localstatedir=%{_var} \ --with-version=%{version}-%{release}