From 0b10570f80117653808260a5da188d7a8e747503 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Fri, 16 Aug 2024 22:01:31 +0100
Subject: [PATCH] Use Java 21 on RHEL 10

---
 pki.spec | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pki.spec b/pki.spec
index 843d1b7eef4..9832f647948 100644
--- a/pki.spec
+++ b/pki.spec
@@ -63,15 +63,7 @@ ExcludeArch: i686
 # Java
 ################################################################################
 
-%if 0%{?rhel}
-
-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
-
-%else
-
-# Use Java 21 on Fedora 40+, otherwise use Java 17.
+# Use Java 21 on Fedora 40+ and RHEL 10, otherwise use Java 17.
 %global java_devel java-devel >= 1:17
 %global java_headless java-headless >= 1:17
 
@@ -83,8 +75,6 @@ ExcludeArch: i686
    set_jvm;
    echo $JAVA_HOME)
 
-%endif
-
 ################################################################################
 # Application Server
 ################################################################################