From f72b4160a3df159b32706c5b4338f84d6b9b9fa3 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] Rebuilt with java-21-openjdk as default JDK:
 https://issues.redhat.com/browse/RHEL-34597

- Resolves: RHEL-54649
---
 dogtag-pki.spec | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 22f823e..08de4da 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -14,7 +14,7 @@ Name:             dogtag-pki
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 1
+%global           release_number 2
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -79,15 +79,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
 
@@ -99,8 +91,6 @@ ExcludeArch: i686
    set_jvm;
    echo $JAVA_HOME)
 
-%endif
-
 ################################################################################
 # Application Server
 ################################################################################
@@ -2051,6 +2041,11 @@ fi
 
 ################################################################################
 %changelog
+* Fri Aug 16 2024 Andrew Hughes <gnu.andrew@redhat.com> - 11.5.4-2
+- Rebuilt with java-21-openjdk as default JDK:
+  https://issues.redhat.com/browse/RHEL-34597
+- Resolves: RHEL-54649
+
 * Thu Aug 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.5.4-1
 - Rebase to PKI 11.5.4
 - Bundle Jakarta libraries