From f5cc2631bf6c1dd73c0f470792cda1e2a05ce36a Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Tue, 23 Aug 2022 08:27:07 -0700 Subject: [PATCH 1/4] Update xCAT-genesis-base.spec Automatically get xCAT version from installed package, rather than having to manually replace the `%%REPLACE_CURRENT_VERSION%%` string. --- xCAT-genesis-builder/xCAT-genesis-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index 831008d41..a45c08cb0 100644 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -1,4 +1,4 @@ -%define version %%REPLACE_CURRENT_VERSION%% +%define version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null) Version: %{?version:%{version}}%{!?version:%(cat Version)} Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} %ifarch i386 i586 i686 x86 From 1508bff83cd793cef6e7978022ca26cf87989707 Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Fri, 26 Aug 2022 09:12:17 -0700 Subject: [PATCH 2/4] Fall back to the repository Version file when xCAT RPM is not installed --- xCAT-genesis-builder/xCAT-genesis-base.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index a45c08cb0..8dc2d7a3a 100644 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -1,5 +1,5 @@ -%define version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null) -Version: %{?version:%{version}}%{!?version:%(cat Version)} +%global version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null | grep -Po '[0-9\.]+' || cat ../Version) +Version: %{version} Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} %ifarch i386 i586 i686 x86 %define tarch x86 From d3a23d48dd61f560114809a2de782eef2a95b327 Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Tue, 30 Aug 2022 08:07:03 -0700 Subject: [PATCH 3/4] hard-code latest xCAT version, in case this RPM is built outside of the xcat-core repo --- xCAT-genesis-builder/xCAT-genesis-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index 8dc2d7a3a..5237147b2 100644 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -1,4 +1,4 @@ -%global version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null | grep -Po '[0-9\.]+' || cat ../Version) +%global version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null | grep -Po %%'[0-9\.]+' || echo "2.16.5") Version: %{version} Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} %ifarch i386 i586 i686 x86 From f3ba47ef2ebef55a102ff5d7acc42a6e2222beee Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Tue, 30 Aug 2022 13:39:33 -0700 Subject: [PATCH 4/4] fix typo --- xCAT-genesis-builder/xCAT-genesis-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec index 5237147b2..3bc288fb2 100644 --- a/xCAT-genesis-builder/xCAT-genesis-base.spec +++ b/xCAT-genesis-builder/xCAT-genesis-base.spec @@ -1,4 +1,4 @@ -%global version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null | grep -Po %%'[0-9\.]+' || echo "2.16.5") +%global version %(rpm -q xCAT --qf "%{VERSION}" 2>/dev/null | grep -Po '[0-9\.]+' || echo "2.16.5") Version: %{version} Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")} %ifarch i386 i586 i686 x86