From 0c077b1eb2d809edea0014b01a7c5e5bb1216000 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 8 May 2023 14:18:56 +0200 Subject: [PATCH] - updated README.md files for sap and sap_swpm roles - migrated to SPDX license - converted patch macro use to the most compatible syntax - rebased sap roles to version 1.2.3 Resolves: #2185037 --- .gitignore | 1 + rhel-system-roles-sap.spec | 31 ++++++++++++++++++++++--------- sources | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a39713d..8808d48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz /community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz /prepare-redhat.sap_install-main.tar.bz2 +/community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec index a14fd5d..866f244 100644 --- a/rhel-system-roles-sap.spec +++ b/rhel-system-roles-sap.spec @@ -26,10 +26,10 @@ # 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.2.1 +%define collection_version 1.2.3 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 -%global commit_id_sap_install f0deb287aaa0fb7d992b95a04b14e263b6690c23 +%global commit_id_sap_install 60f5f40497d54c46b0bd3f79ef1fef4ada148119 %global rolename1 sap_general_preconfigure %global rolename2 sap_hana_preconfigure %global rolename3 sap_netweaver_preconfigure @@ -53,12 +53,12 @@ Name: %{package_name} Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products -Version: 3.4.0 -Release: 3%{?dist} -License: GPLv3+ -Url: https://github.com/berndfinger/community.sap_install +Version: 3.5.0 +Release: 1%{?dist} +License: GPL-3.0-or-later +Url: https://github.com/sap-linuxlab/community.sap_install Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz -Source1: https://github.com/berndfinger/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz +Source1: https://github.com/sap-linuxlab/%{github_repo_sap_install}/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz # files/README.md, files/roles/sap_swpm/README.md from https://gitlab.cee.redhat.com/sap-linuxlab/prepare-redhat.sap_install Source2: prepare-redhat.sap_install-main.tar.bz2 Patch1: community.sap_install-shebang.patch @@ -135,13 +135,16 @@ sed -i -e "s|^namespace: .*|namespace: %{collection_namespace}|" galaxy.yml sed -i -e "s|^version: .*|version: %{collection_version}|" galaxy.yml # update README.md and roles/sap_swpm/README.md -cp prepare-redhat.sap_install-main/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/ +cp prepare-redhat.sap_install-main/files/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/ cp prepare-redhat.sap_install-main/files/roles/sap_swpm/README.md %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_swpm/README.md +# remove roles/sap_swpm/requirements.yml +rm -f %{github_repo_sap_install}-%{commit_id_sap_install}/roles/sap_swpm/requirements.yml + pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ # workaround for md2html error sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md -%patch1 -p1 +%patch -P1 -p1 # modify collection-requirements.yml, fedora.linux_system_roles -> redhat.rhel_system_roles for r in %{rolenames} ; do @@ -200,6 +203,8 @@ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role done cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} +# update README.md +cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.md .collections/ansible_collections/%{collection_namespace}/%{collection_name} %install mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \ @@ -256,6 +261,14 @@ popd %endif %changelog +* Mon May 08 2023 Than Ngo - 3.5.0-1 +- updated README.md files for sap and sap_swpm roles +- migrated to SPDX license +- converted patch macro use to the most compatible syntax +- rebased sap roles to version 1.2.3 +Resolves: #2185037 + + * Mon Jan 30 2023 Than Ngo - 3.4.0-3 - Related: #2155876, rebase sap roles to version 1.2.1 diff --git a/sources b/sources index 058d824..ef150df 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c -SHA512 (community.sap_install-f0deb287aaa0fb7d992b95a04b14e263b6690c23.tar.gz) = f3ec9fef5c680837e6e5113da16923ea537413a72d7b08cd7d1a8dc84c58c636efdf232315ff0cce2e6b1e16ef89d2fe9af002d60c7129c6562d240147acd286 -SHA512 (prepare-redhat.sap_install-main.tar.bz2) = c300614cd7f57443399dcfe1b579954fafdbb96284c5e3c457b69260eda68bd1f4686ba1ba21bc22478228921dc5341af6f309e74fbafd8a3263596509ecabe2 +SHA512 (prepare-redhat.sap_install-main.tar.bz2) = e152e015b1ff1f0e58f632e177166c1a1b296178960b0efddf8023d3544bfeeed36da8f0befe4c24cd6f778883139c64df3e713a60e8fe9a3b2e21aa43901a61 +SHA512 (community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz) = e3cbb66878f7920882eebbf4800b9302825d7a458a1087fb36e88f1d1ee184acf5a8e6f485fdfa012a179a28df95aac5bfbe14222192d75877e438e0f55fbc26