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

- pengine: cl#5130 - Only check the capacities of the nodes that are allowed to run the resource (FATE#313105)
- cib: Correctly add "update-origin", "update-client" and "update-user" attributes for cib (bsc#931177)
- fencing : Correction of the log output of the practice node of stonith.
- Upstream version cs: a0449d443fa5c834207def5fe36a117a53c334d6

- xml: Correctly create v1 patchsets when deleting attributes (bsc#931170)
- xml: Prevent potential use-of-NULL (bsc#929960)
- Upstream version cs: 677f53216662d121a47b4c7683ec3749c614437e

- cib: No need to enforce cib digests for v2 diffs in legacy mode (bsc#929960)
- cib: Ability to upgrade cib validation schema in legacy mode (bsc#929960)
- xml: Do not dump deleted attributes (bsc#929960)
- cib: Revert d153b86 to instantly get cib synchronized in legacy mode (bsc#929960)
- cib: Enable cib legacy mode for plugin-based clusters (bsc#929960)
- Build: CRM_STATE_DIR is created dynamically when needed
- Tools: Repair expected output for ACLs
- Build: Prevent rpm packaging conflicts
- pengine: cl#5130 - Choose nodes capable of running all the colocated utilization resources (FATE#313105)
  * Drop obsolete pacemaker-colocated-utilization.patch
- Upstream version cs: 0b79da3e73fe2ced8b9602aa59d55873d857b3e7

- crmd/pengine: implement on-fail=ignore without allow-fail
- pengine: Prevent use-after-free in sort_rsc_process_order() (bsc#930368)
- crmd: Prevent the old version of DC from being fenced when it shuts down for rolling-upgrade (bsc#929955)
- xml: Fix upgrade-1.3.xsl to correctly transform ACL rules with "attribute" (bsc#929681)
- crmd/pengine: handle on-fail=ignore properly
- crmd: respect start-failure-is-fatal even for artifically injected events
- crmd: don't update fail count twice for same failure
- crmd: report operation rc as advertised instead of status
- xml: add RelaxNG schema for crm_mon XML output

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

pacemaker.spec

@@ -99,7 +99,7 @@ Name:           pacemaker
 Summary:        Scalable High-Availability cluster resource manager
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-Version:        1.1.12.git20150504.f47ea56
+Version:        1.1.12+git20150602.a0449d4
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org
@@ -111,11 +111,10 @@ Source100:      pacemaker.rpmlintrc
 Patch1:         bug-806256_pacemaker-log-level-notice.patch
 Patch2:         bug-728579_pacemaker-stonith-dev-id.patch
 Patch3:         pacemaker-NodeUtilization-RA.patch
-Patch4:         pacemaker-colocated-utilization.patch
-Patch5:         pacemaker-cibsecret-tool-temp-disabled.patch
-Patch6:         pacemaker-nagios-plugin-dir.patch
-Patch7:         bug-812269_pacemaker-fencing-device-register-messages.patch
-Patch8:         pacemaker-Wno-format-signedness.patch
+Patch4:         pacemaker-cibsecret-tool-temp-disabled.patch
+Patch5:         pacemaker-nagios-plugin-dir.patch
+Patch6:         bug-812269_pacemaker-fencing-device-register-messages.patch
+Patch7:         pacemaker-Wno-format-signedness.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       pacemaker-ticket-support = 2.0
 Conflicts:      heartbeat < 3.0
@@ -397,7 +396,6 @@ manager for Corosync, CMAN and/or Linux-HA.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 # Force the local time
 #
@@ -416,7 +414,7 @@ docdir=%{pcmk_docdir} %{configure}                 \
         %{?with_coverage:    --with-coverage}      \
         %{!?with_cman:       --without-cman}       \
 %if !%with_heartbeat_support
-	--without-heartbeat			   \
+        --without-heartbeat			   \
 %endif
 %if %with_nagios
         --with-nagios=true                         \
@@ -678,7 +676,6 @@ fi
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
-%ghost %dir %attr (750, %{uname}, %{gname}) %{_rundir}/crm
 %dir /usr/lib/ocf
 %dir /usr/lib/ocf/resource.d
 /usr/lib/ocf/resource.d/pacemaker
@@ -800,7 +797,7 @@ fi
 %{_includedir}/pacemaker
 %{_libdir}/*.so
 %if %{with coverage}
-%{_var}/lib/pacemaker
+%{_var}/lib/pacemaker/gcov
 %endif
 %{_libdir}/pkgconfig/*.pc
 %doc COPYING.LIB