From 78d18ff8cc94240849857bc4e463f346d1920bda Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 15 Oct 2024 00:46:41 -0700
Subject: [PATCH] setup variables to be X.Y

---
 rocky/variables.conf | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/rocky/variables.conf b/rocky/variables.conf
index ff34ec4..9132bac 100644
--- a/rocky/variables.conf
+++ b/rocky/variables.conf
@@ -3,8 +3,10 @@
 
 RELEASE_NAME = 'Rocky Linux'
 RELEASE_SHORT = 'Rocky'
-RELEASE_VERSION = '9'
-VERSION = '9-lh'
+RELEASE_VERSION_X = '9'
+RELEASE_VERSION_Y = '5'
+RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y)
+RELEASE_VERSION = RELEASE_VERSION_XY
 
 PKGSET_KOJI_TAG = 'r9-compose'
 PKGSET_KOJI_MODULE_TAG = 'el9-modules-pending-signed'
@@ -14,19 +16,19 @@ RUNROOT_TAG = 'r9-build'
 
 COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git'
 COMPS_BRANCH = 'main'
-COMPS_FILE = 'comps-rocky-%s.xml' % VERSION
+COMPS_FILE = 'comps-rocky-%s.xml' % RELEASE_VERSION
 COMPS_COMMAND = ''
 
 MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git'
-MODULE_DEFAULTS_BRANCH = 'r9s'
+MODULE_DEFAULTS_BRANCH = 'r%s' % RELEASE_VERSION
 
 VARIANTS_SCM = 'git'
 VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION
+VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION_X
 VARIANTS_FILE = 'variants.xml'
 
 GATHER_PREPOPULATE_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-GATHER_PREPOPULATE_BRANCH = 'r%ss' % RELEASE_VERSION
+GATHER_PREPOPULATE_BRANCH = 'r%ss' % RELEASE_VERSION_X
 GATHER_PREPOPULATE_FILE = 'prepopulate.json'
 GATHER_PREPOPULATE_COMMAND = ''