import CS rhel-system-roles-sap-3.7.0-1.el9_4

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-SOURCES/redhat.sap_install-1.3.5.tar.gz
+SOURCES/redhat.sap_install-1.3.7.tar.gz

.rhel-system-roles-sap.metadata

@@ -1,2 +1,2 @@
 584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-835376d0e4799989e9d4deb21ac7e1d335c941de SOURCES/redhat.sap_install-1.3.5.tar.gz
+617726545afe6c8eac789c4e0a86501828733a1f SOURCES/redhat.sap_install-1.3.7.tar.gz

SPECS/rhel-system-roles-sap.spec

@@ -24,8 +24,9 @@
 # collection_version has to be increased by every rebuild
 # otherwise, it cannot be uploaded to Automation Hub and Galaxy
 # due to version conflict
-%define collection_version 1.3.5
+%define collection_version 1.3.7
 
+%global collection_dir collections/ansible_collections/redhat/sap_install
 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
 %global commit_id_sap_install %{collection_version}
 %global rolename1 sap_general_preconfigure
@@ -44,21 +45,18 @@
 
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
-Version: 3.6.0
+Version: 3.7.0
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPL-3.0-or-later
 Url: https://github.com/redhat-sap/community.sap_install
 Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: https://github.com/redhat-sap/redhat.sap_install/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz
 
-# add collection files
-Patch1: redhat.sap_install-1.3.5-collections-files-324bfb8bab50d2baa1c4aacdb59e4e5c9e2ba74f.patch
-
 # add tests files
-Patch2: redhat.sap_install-1.3.4-add_tests.patch
+Patch1: redhat.sap_install-1.3.4-add_tests.patch
 
 # add tools files
-Patch3: redhat.sap_install-1.3.4-add_tools.patch
+Patch2: redhat.sap_install-1.3.4-add_tools.patch
 
 BuildArch: noarch
 
@@ -75,6 +73,8 @@ BuildRequires: highlight
 %endif
 %endif
 
+BuildRequires: tar
+
 # Requirements for galaxy_transform.py
 BuildRequires: python3
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -133,7 +133,13 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
 pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
 %patch -P1 -p1
 %patch -P2 -p1
-%patch -P3 -p1
+
+# unpack collection tar file
+%if %{without collection}
+mkdir -p %{collection_dir}
+tar zxf redhat-sap_install-%{collection_version}.tar.gz -C %{collection_dir}
+%endif
+
 # workaround for md2html error
 sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md
 popd
@@ -247,6 +253,9 @@ popd
 %endif
 
 %changelog
+* Tue May 14 2024 Than Ngo <than@redhat.com> - 3.7.0-1
+- Resolves: RHEL-34806, rebase sap roles to version 1.3.7
+
 * Mon Feb 05 2024 Than Ngo <than@redhat.com> - 3.6.0-4
 - sap_hypervisor_node_preconfigure: fix for role name and path for included tasks
 - update collection files