From 4cf53816f600714f06ecc1cbfbb75fb5613ff294 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-212293
---
 java-25-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-25-openjdk.spec b/java-25-openjdk.spec
index 926bbf3..70392f3 100644
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@@ -2608,8 +2608,10 @@ exit 0
 - Bump libpng version to 1.6.58 following JDK-8384495
 - Require tzdata 2026b due to upstream inclusion of JDK-8383175
 - Drop local copy of JDK-8375294 EOPNOTSUPP patch
+- Obsolete old RHEL releases (9.7.0-z, 10.1-z)
 - ** This tarball is embargoed until 2026-07-21 @ 1pm PT. **
 - Resolves: RHEL-188880
+- Resolves: RHEL-212293
 
 * Wed Jul 15 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:25.0.3.0.9-3.2
 - Add family option with name argument to alternatives install lines (OPENJDK-4854)
diff --git a/scripts/builds/tag_rhel_10_embargoed_pqc.sh b/scripts/builds/tag_rhel_10_embargoed_pqc.sh
index 3fe9fae..e617b43 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 be996ca..764643a 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 59668d5..4f8c12d 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 8afe106..d420331 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"