From ae42098fa45c365f2d229ac5a77f47dc2e3e6be7 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Fri, 17 Jul 2026 23:03:22 +0100
Subject: [PATCH] Obsolete old RHEL releases (9.7.0-z, 10.1-z)

Resolves: RHEL-212344
---
 java-21-openjdk.spec                        | 2 ++
 scripts/builds/tag_rhel_10_embargoed_pqc.sh | 2 +-
 scripts/builds/tag_rhel_10_public_pqc.sh    | 2 +-
 scripts/builds/tag_rhel_9_embargoed_pqc.sh  | 2 +-
 scripts/builds/tag_rhel_9_public_pqc.sh     | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index cc3b0a3..ac8fdd1 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2583,6 +2583,7 @@ require "copy_jdk_configs.lua"
 - Remove macro references in comments where possible (%dnl not compatible enough yet)
 - Move version information and core NVR definitions back towards the top of the file
 - Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
+- Obsolete old RHEL releases (9.7.0-z, 10.1-z)
 - ** This tarball is embargoed until 2026-07-21 @ 1pm PT. **
 - Resolves: RHEL-212331
 - Resolves: RHEL-212333
@@ -2590,6 +2591,7 @@ require "copy_jdk_configs.lua"
 - Resolves: RHEL-212351
 - Resolves: RHEL-212337
 - Resolves: RHEL-188853
+- Resolves: RHEL-212344
 
 * Sat Jul 18 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.11.0.10-1.2
 - Disable abidiff inspection in rpminspect.yaml to avoid an out-of-memory error on the CentOS test farm
diff --git a/scripts/builds/tag_rhel_10_embargoed_pqc.sh b/scripts/builds/tag_rhel_10_embargoed_pqc.sh
index b356a44..cf2389d 100755
--- a/scripts/builds/tag_rhel_10_embargoed_pqc.sh
+++ b/scripts/builds/tag_rhel_10_embargoed_pqc.sh
@@ -27,7 +27,7 @@ if test "${BUILD}" = ""; then
 fi
 
 BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="10.2-z 10.1-z"
+SUPPORTED_VERS="10.2-z"
 WORKING_DIR=$(dirname "${0}")
 EMBARGOED_SUFFIX="nocompose-candidate"
 
diff --git a/scripts/builds/tag_rhel_10_public_pqc.sh b/scripts/builds/tag_rhel_10_public_pqc.sh
index 38074ac..b5f9363 100755
--- a/scripts/builds/tag_rhel_10_public_pqc.sh
+++ b/scripts/builds/tag_rhel_10_public_pqc.sh
@@ -27,7 +27,7 @@ if test "${BUILD}" = ""; then
 fi
 
 BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="10.3 10.2-z 10.1-z"
+SUPPORTED_VERS="10.3 10.2-z"
 WORKING_DIR=$(dirname "${0}")
 GATE_SUFFIX="gate"
 
diff --git a/scripts/builds/tag_rhel_9_embargoed_pqc.sh b/scripts/builds/tag_rhel_9_embargoed_pqc.sh
index b7f2ee6..be3e82e 100755
--- a/scripts/builds/tag_rhel_9_embargoed_pqc.sh
+++ b/scripts/builds/tag_rhel_9_embargoed_pqc.sh
@@ -27,7 +27,7 @@ if test "${BUILD}" = ""; then
 fi
 
 BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="9.8.0-z 9.7.0-z"
+SUPPORTED_VERS="9.8.0-z"
 WORKING_DIR=$(dirname "${0}")
 EMBARGOED_SUFFIX="nocompose-candidate"
 
diff --git a/scripts/builds/tag_rhel_9_public_pqc.sh b/scripts/builds/tag_rhel_9_public_pqc.sh
index 2702105..423f5d7 100755
--- a/scripts/builds/tag_rhel_9_public_pqc.sh
+++ b/scripts/builds/tag_rhel_9_public_pqc.sh
@@ -27,7 +27,7 @@ if test "${BUILD}" = ""; then
 fi
 
 BUILDLOG=$(mktemp --tmpdir "temp-${BUILD}-buildinfo-XXX")
-SUPPORTED_VERS="9.9.0 9.8.0-z 9.7.0-z"
+SUPPORTED_VERS="9.9.0 9.8.0-z"
 WORKING_DIR=$(dirname "${0}")
 GATE_SUFFIX="gate"