Accepting request 344882 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/344882
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=97

_service

@@ -11,7 +11,7 @@
     <param name="version">1.1.13</param>
 -->
     <param name="versionformat">1.1.13+git%cd.%h</param>
-    <param name="revision">577898dc4ac1efdb5989a996cb5f9ac60ed2eb7a</param>
+    <param name="revision">6f22ad7312b703289da5d24e918a78117a0825e1</param>
   </service>
 
   <service name="recompress" mode="disabled">

crm_report.in

@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Copyright (C) 2007 Dejan Muhamedagic <dmuhamedagic@suse.com>
+# Copyright (C) 2015 Kristoffer Gronlund <kgronlund@suse.com>
+# Copyright (C) 2015 Gao,Yan <ygao@suse.com>
+#
+# Replaced with crm report
+PARENT_COMMAND="$(ps -o comm= $PPID)"
+PROG="$(basename "$0")"
+
+die() {
+	echo "$PROG: $*"
+	exit 1
+}
+[ "$(basename "$PARENT_COMMAND")" = "crm" ] && die "called itself in a loop, aborting"
+if which crm > /dev/null 2>&1; then
+	crm report "$@"
+elif [ -x /usr/sbin/crm ]; then
+	/usr/sbin/crm report "$@"
+else
+	#die "crm_report has been deprecated: Please install crmsh, which replaces it"
+	/usr/sbin/crm_report.pacemaker "$@"
+fi

pacemaker-1.1.13+git20151105.577898d.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f608f02bd8ac0fdd6ec4b9a227fc13d7b603edc547b32986ac1dfe556785c19
-size 3715071

pacemaker-1.1.13+git20151111.6f22ad7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9f914077fcacf007b95bfbb4b68d07dba5ad8b359d71b8b95fefcb8e9b744e9
+size 3717142

pacemaker.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Nov 16 17:49:49 UTC 2015 - ygao@suse.com
+
+- crm_report: Call "crm report" if available (bsc#950483)
+
+-------------------------------------------------------------------
+Thu Nov 12 11:18:49 UTC 2015 - ygao@suse.com
+
+- fencing: crm_resource --show-metadata drops documentation strings for fencing agents (bsc#950375)
+- Upstream version cs: 6f22ad7312b703289da5d24e918a78117a0825e1
+
 -------------------------------------------------------------------
 Thu Nov  5 22:51:27 UTC 2015 - ygao@suse.com
 
@@ -143,7 +154,7 @@ Thu Aug 13 12:56:09 UTC 2015 - ygao@suse.com
 - fencing: Remove unnecessary casts (bsc#940711)
 - crm_simulate: Prevent segfault on arches with 64bit time_t (bsc#940711)
 - ipc: Correctly compare values for the size of ipc buffer and prevent suggesting a negative value when it's insufficient (bsc#940992)
-- xml: Reduce severity of noisy log message
+- xml: Reduce severity of noisy log message (bsc#950551)
 - crm_resource: Correctly clean up failcounts for inactive anonymous clones
 - crmd: Avoid cancelling transitions when we tell nodes to shutdown
 - systemd: drop legacy SysVStartPriority from service units

pacemaker.spec

@@ -100,13 +100,14 @@ Name:           pacemaker
 Summary:        Scalable High-Availability cluster resource manager
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-Version:        1.1.13+git20151105.577898d
+Version:        1.1.13+git20151111.6f22ad7
 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:        %{name}-%{version}.tar.bz2
+Source1:        crm_report.in
 Source100:      pacemaker.rpmlintrc
 Patch1:         bug-806256_pacemaker-log-level-notice.patch
 Patch2:         bug-728579_pacemaker-stonith-dev-id.patch
@@ -493,6 +494,9 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker_remote
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccrm_mon
 %endif
 
+mv %{buildroot}%{_sbindir}/crm_report %{buildroot}%{_sbindir}/crm_report.pacemaker
+install -m 755 %{S:1} %{buildroot}%{_sbindir}/crm_report
+
 %if %{with coverage}
 GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
 mkdir -p $GCOV_BASE
@@ -709,6 +713,7 @@ fi
 %{_sbindir}/crm_shadow
 %{_sbindir}/crm_simulate
 %{_sbindir}/crm_report
+%{_sbindir}/crm_report.pacemaker
 %{_sbindir}/crm_ticket
 %exclude %{_datadir}/pacemaker/tests
 %{_datadir}/pacemaker