From 7559b4cdb93d5a92c6b14b28b09cabebcc5965f9 Mon Sep 17 00:00:00 2001 From: Diego Herrera Date: Sep 18 2024 03:57:05 +0000 Subject: Handle rhel runtimes when minor version exists in disttag Signed-off-by: Diego Herrera --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index 3d54c56..7683f45 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -177,10 +177,15 @@ class Commands(pyrpkg.Commands): "--define", "%s 1" % self._disttag.replace(".", "_")] # TODO: consider removing macro "%s 1; it has unknown/dubious functionality" + # If the runtime is known, and is different from + # the target, we need to unset the _runtime_disttag if self._runtime_disttag: - if self._disttag != self._runtime_disttag: - # This means that the runtime is known, and is different from - # the target, so we need to unset the _runtime_disttag + # In the case of rhel like runtimes, only the major needs to be different + if re.match(r'^el\d', self._runtime_disttag): + if not self._disttag.startswith(self._runtime_disttag): + self._rpmdefines.extend(["--eval", "%%undefine %s" % + self._runtime_disttag]) + elif self._disttag != self._runtime_disttag: self._rpmdefines.extend(["--eval", "%%undefine %s" % self._runtime_disttag])