From 1508bff83cd793cef6e7978022ca26cf87989707 Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Fri, 26 Aug 2022 09:12:17 -0700 Subject: [PATCH] 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