Accepting request 579246 from home:yan_gao:branches:network:ha-clustering:Factory:Test

- Build: Ship cibsecret by pacemaker instead of cluster-glue (bsc#1082456)
  * Drop obsolete pacemaker-cibsecret-tool-temp-disabled.patch

- Update to version 1.1.18+20180216.ae50b7f5d:
- various: improve string allocation
- XML: upgrade-2.10.xsl: re(drop) rsc_colocation/@score-attribute{,-mangle}
- XML: upgrade-*.xsl: bump the validate-with field from within stylesheet
- XML: upgrade-*.xsl: omit XML declaration
- upgrade-*.xsl: don't be picky about comments, PIs, etc.

- Update to version 1.1.18+20180213.965befd59:
- libcrmcommon: use /tmp when creating temporary XML file
- tools: crm_master should always work on node attribute
- tools: crm_resource --cleanup couldn't match clone instances
- tools: crm_resource --refresh should ignore --operation and --interval
- crmd: quorum gain should always cause new transition
- rhbz#1527072 - Correctly observe colocation constraints with bundles in the Master role
- Bug rhbz#1519812 - Prevent notify actions from causing --wait to hang
- libpe_status: recover after failed demote when appropriate
- lrmd: always use most recent remote proxy
- libpe_status: limit resource type check to primitives
- PE: correct mispelled constant
- PE: Ensure stop operations occur after stopped remote connections have been brought up
- PE: Remote connection resources are safe to to require only quorum
- PE: Only allowed nodes need to be considered when ordering resource startup after _all_ recovery
- PE: Ordering bundle child stops/demotes after container fencing causes graph loops
- PE: Passing boolean instead of a pointer

OBS-URL: https://build.opensuse.org/request/show/579246
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=299

pacemaker.spec

@@ -71,7 +71,7 @@
 %endif
 
 Name:           pacemaker
-Version:        1.1.18+20180209.7acb22379
+Version:        1.1.18+20180216.ae50b7f5d
 Release:        0
 Summary:        Scalable High-Availability cluster resource manager
 # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@@ -85,15 +85,14 @@ Source1:        crm_report.in
 Source100:      pacemaker.rpmlintrc
 Patch1:         bug-806256_pacemaker-log-level-notice.patch
 Patch2:         bug-728579_pacemaker-stonith-dev-id.patch
-Patch3:         pacemaker-cibsecret-tool-temp-disabled.patch
-Patch4:         pacemaker-nagios-plugin-dir.patch
-Patch5:         bug-812269_pacemaker-fencing-device-register-messages.patch
-Patch6:         pacemaker-Wno-format-signedness.patch
-Patch7:         bug-943295_pacemaker-lrmd-log-notice.patch
-Patch8:         bug-977201_pacemaker-controld-self-fencing.patch
-Patch9:         bug-995365_pacemaker-cts-restart-systemd-journald.patch
-Patch10:        fate-323526_pacemaker-tests-shebang-python3.patch
-Patch11:        pacemaker-cts-StartCmd.patch
+Patch3:         pacemaker-nagios-plugin-dir.patch
+Patch4:         bug-812269_pacemaker-fencing-device-register-messages.patch
+Patch5:         pacemaker-Wno-format-signedness.patch
+Patch6:         bug-943295_pacemaker-lrmd-log-notice.patch
+Patch7:         bug-977201_pacemaker-controld-self-fencing.patch
+Patch8:         bug-995365_pacemaker-cts-restart-systemd-journald.patch
+Patch9:         fate-323526_pacemaker-tests-shebang-python3.patch
+Patch10:        pacemaker-cts-StartCmd.patch
 # Required for core functionality
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -111,6 +110,10 @@ BuildRequires:  pkgconfig
 # Required for agent_config.h which specifies the correct scratch directory
 BuildRequires:  resource-agents
 BuildRequires:  sed
+%if %{with_cibsecrets}
+BuildRequires:  openssh
+BuildRequires:  procps
+%endif
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(corosync)
 BuildRequires:  pkgconfig(dbus-1)
@@ -302,7 +305,6 @@ manager.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 %build
 
@@ -480,6 +482,7 @@ fi
 %dir %{_libexecdir}/pacemaker
 %{_libexecdir}/pacemaker/*
 
+%{_sbindir}/cibsecret
 %{_sbindir}/crm_node
 %{_sbindir}/fence_legacy
 %{_sbindir}/stonith_admin
@@ -490,6 +493,7 @@ fi
 %{_mandir}/man7/ocf_pacemaker_controld.7%{ext_man}
 %{_mandir}/man7/ocf_pacemaker_o2cb.7%{ext_man}
 %{_mandir}/man7/ocf_pacemaker_remote.7%{ext_man}
+%{_mandir}/man8/cibsecret.8%{ext_man}
 %{_mandir}/man8/crm_node.8%{ext_man}
 %{_mandir}/man8/fence_legacy.8%{ext_man}
 %{_mandir}/man8/pacemakerd.8%{ext_man}
@@ -559,6 +563,7 @@ fi
 %exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
 %exclude %{_mandir}/man7/ocf_pacemaker_remote.*
 %{_mandir}/man8/*
+%exclude %{_mandir}/man8/cibsecret.*
 %exclude %{_mandir}/man8/crm_node.*
 %exclude %{_mandir}/man8/fence_legacy.*
 %exclude %{_mandir}/man8/pacemakerd.*