From f6deff08bc9375266572fdeaf0423bd935653f59 Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Thu, 9 Jul 2026 22:05:49 -0300
Subject: [PATCH] fix(genesis-scripts): floor genesis-base requirement at
 2:2.18.0

Requiring xCAT-genesis-base >= 2:%{version} coupled the flat xcat-core to a
matching genesis-base on every marketing-version bump: a 2.18.1 core refused
to install against the deployed 2.18.0 genesis-base. genesis-base changes
rarely and lives in the separate per-EL xcat-dep repo, so floor the requirement
at the fixed 2.18.0 baseline instead. Core version bumps no longer force a
genesis-base re-publish.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
---
 xCAT-genesis-scripts/xCAT-genesis-scripts.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index 0bbb41c50..79c70749a 100644
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -32,13 +32,15 @@ Vendor: IBM Corp.
 Summary: xCAT Genesis netboot image - Core content
 URL:	 https://xcat.org/
 Source1: xCAT-genesis-scripts.tar.bz2
-# Require any same-version (or newer) genesis-base, NOT the exact snap. genesis-base
+# Require a fixed genesis-base floor, NOT the exact snap and NOT %{version}. genesis-base
 # lives in the per-EL xcat-dep repo while this package ships in the flat xcat-core;
 # pinning the exact -%{release} forced the two repos to be republished in lockstep on
-# every core rebuild. >= 2:%{version} (epoch 2, version, no release) lets any 2.18.0
-# genesis-base snap satisfy it, so routine core snaps no longer require a genesis-base
-# re-publish. (RPM ignores release when the dependency omits it.)
-Requires: xCAT-genesis-base-%{tarch} >= 2:%{version}
+# every core rebuild, and pinning >= 2:%{version} did the same on every marketing-version
+# bump (a 2.18.1 core then demanded a 2.18.1 genesis-base). genesis-base changes rarely,
+# so floor it at the 2.18.0 baseline: any 2.18.0-or-newer genesis-base snap satisfies it,
+# and core version bumps no longer force a genesis-base re-publish. (RPM ignores release
+# when the dependency omits it.)
+Requires: xCAT-genesis-base-%{tarch} >= 2:2.18.0
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis
 Packager: IBM Corp.