Consolidate spec version defines and prevent CLK kernel from hijacking boot default

Reduce duplicated version numbers in the spec to single sources of truth:
- kernel_major_minor, kernel_patch, and buildid are the base defines
- specversion, kversion, patchlevel, pkgrelease, specrelease, and
  tarfile_release are all derived from them
- Remove specrpmversion (identical to specversion)
- Add el_version for tarball naming

Export GRUB_NON_STANDARD_KERNEL=true in the posttrans before calling
kernel-install so that 20-grub.install respects DEFAULTKERNEL in
/etc/sysconfig/kernel. When DEFAULTKERNEL=kernel-core, the CLK kernel
will no longer take over as the boot default on upgrade.

Update generate_tarball.sh to extract the base defines and compute
derived values rather than reading the now-derived tarfile_release
directly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Jonathan Dieter <jdieter@ciq.com>

Author: 2 people

ciq/SOURCES/generate_tarball.sh

@@ -11,18 +11,22 @@ SOURCE_DIR="$DISTGIT_ROOT/SOURCES"
 SPEC_FILE="$DISTGIT_ROOT/SPECS/kernel-clk6.18.spec"
 
 # Extract version information from spec file
-TARFILE_RELEASE=$(grep '^%define tarfile_release' "$SPEC_FILE" | awk '{print $3}')
-SPEC_VERSION=$(grep '^%define specversion' "$SPEC_FILE" | awk '{print $3}')
-
-if [ -z "$TARFILE_RELEASE" ]; then
-    echo "Error: Could not extract tarfile_release from $SPEC_FILE"
+KERNEL_MAJOR_MINOR=$(grep '^%define kernel_major_minor' "$SPEC_FILE" | awk '{print $3}')
+KERNEL_PATCH=$(grep '^%define kernel_patch' "$SPEC_FILE" | awk '{print $3}')
+BUILDID=$(grep '^%define buildid' "$SPEC_FILE" | awk '{print $3}')
+PKGRELEASE=$(grep '^%define pkgrelease' "$SPEC_FILE" | awk '{print $3}')
+EL_VERSION=$(grep '^%define el_version' "$SPEC_FILE" | awk '{print $3}')
+
+if [ -z "$KERNEL_MAJOR_MINOR" ] || [ -z "$KERNEL_PATCH" ] || [ -z "$PKGRELEASE" ] || [ -z "$EL_VERSION" ]; then
+    echo "Error: Could not extract kernel version from $SPEC_FILE"
     exit 1
 fi
 
-if [ -z "$SPEC_VERSION" ]; then
-    echo "Error: Could not extract specversion from $SPEC_FILE"
-    exit 1
-fi
+# Resolve macros in pkgrelease
+PKGRELEASE=$(echo "$PKGRELEASE" | sed "s/%{?buildid}/${BUILDID}/")
+
+SPEC_VERSION="${KERNEL_MAJOR_MINOR}.${KERNEL_PATCH}"
+TARFILE_RELEASE="${SPEC_VERSION}-${PKGRELEASE}.el${EL_VERSION}"
 
 # Get current git tag and extract version
 CURRENT_TAG=$(git describe --tags --abbrev=0 2>/dev/null)