import resource-agents-sap-hana-0.155.0-4.el9

SOURCES/bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch

@@ -0,0 +1,41 @@
+From 182dbd793e9c6ce0e5a0abc7d595a864175248bb Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 20 Jan 2022 10:41:51 +0100
+Subject: [PATCH] SAPHana*: follow OCF standard for version and OCF version in
+ metadata
+
+---
+ heartbeat/SAPHana         | 4 ++--
+ heartbeat/SAPHanaTopology | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/SAPHana b/heartbeat/SAPHana
+index 295eff0..6527362 100755
+--- a/heartbeat/SAPHana
++++ b/heartbeat/SAPHana
+@@ -160,8 +160,8 @@ function saphana_meta_data() {
+     cat <<END
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+-<resource-agent name="SAPHana">
+-<version>$SAPHanaVersion</version>
++<resource-agent name="SAPHana" version="$SAPHanaVersion">
++<version>1.0</version>
+ 
+ <shortdesc lang="en">Manages two SAP HANA database systems in system replication (SR).</shortdesc>
+ <longdesc lang="en">
+diff --git a/heartbeat/SAPHanaTopology b/heartbeat/SAPHanaTopology
+index 3fce400..9ad2101 100755
+--- a/heartbeat/SAPHanaTopology
++++ b/heartbeat/SAPHanaTopology
+@@ -134,8 +134,8 @@ function sht_meta_data() {
+ 	cat <<END
+ <?xml version="1.0"?>
+ <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
+-<resource-agent name="SAPHanaTopology">
+-    <version>$SAPHanaTopologyVersion</version>
++<resource-agent name="SAPHanaTopology" version="$SAPHanaTopologyVersion">
++    <version>1.0</version>
+     <shortdesc lang="en">Analyzes SAP HANA System Replication Topology.</shortdesc>
+     <longdesc lang="en">This RA analyzes the SAP HANA topology and "sends" all findings via the node status attributes to
+         all nodes in the cluster. These attributes are taken by the SAPHana RA to control the SAP Hana Databases.

SPECS/resource-agents-sap-hana.spec

@@ -49,13 +49,14 @@ Name:		resource-agents-sap-hana
 Summary:	SAP HANA cluster resource agents
 Epoch:		1
 Version:	0.155.0
-Release:	3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/SUSE/SAPHanaSR
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Source1:	%{saphana_prefix}-%{saphana_version}.tar.gz
 Patch0:		bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
 Patch1:		bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
+Patch2:		bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch
 
 BuildArch:	noarch
 
@@ -110,6 +111,7 @@ sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{s
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 if [ ! -f configure ]; then
@@ -193,7 +195,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %exclude /usr/src
 
 %changelog
-* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-3
+* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-4
 - SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
   metadata