From ac57db97548dfeea75d43daba8a5906ce7879030 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Wed, 5 Feb 2025 14:50:05 +0000
Subject: [PATCH] update to use tomcat9 fix FTBFS

Resolves: RHEL-78038
---
 dogtag-pki.spec | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 26ea542..f785038 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 0.2
+%global           release_number 0.3
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -83,14 +83,6 @@ ExcludeArch: i686
 %global java_devel java-devel >= 1:17
 %global java_headless java-headless >= 1:17
 
-# Don't use find since it might not work well with local builds.
-#   find {_jvmdir} -maxdepth 1 | grep "jre-[0-9]\+$"
-%global java_home %(
-   source /usr/share/java-utils/java-functions;
-   _prefer_jre=true;
-   set_jvm;
-   echo $JAVA_HOME)
-
 ################################################################################
 # Application Server
 ################################################################################
@@ -196,6 +188,7 @@ BuildRequires:    maven-local
 BuildRequires:    xmvn-tools
 %endif
 BuildRequires:    javapackages-tools
+BuildRequires:    javapackages-local
 
 %if %{without runtime_deps}
 BuildRequires:    xmlstarlet
@@ -239,6 +232,7 @@ BuildRequires:    mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
 BuildRequires:    mvn(org.apache.tomcat:tomcat-servlet-api) >= 9.0.62
 BuildRequires:    mvn(org.apache.tomcat:tomcat-jaspic-api) >= 9.0.62
 BuildRequires:    mvn(org.apache.tomcat:tomcat-util-scan) >= 9.0.62
+BuildRequires:    tomcat9-lib
 
 BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
 BuildRequires:    mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0
@@ -657,7 +651,7 @@ Requires:         mvn(org.jboss.resteasy:resteasy-servlet-initializer)
 Provides:         bundled(resteasy-servlet-initializer) = 3.0.26
 %endif
 
-Requires:         tomcat >= 1:9.0.62
+Requires:         tomcat9 >= 1:9.0.62
 Requires:         mvn(org.dogtagpki.jss:jss-tomcat) >= 5.5.0
 
 Requires:         systemd
@@ -2061,6 +2055,11 @@ fi
 
 ################################################################################
 %changelog
+* Wed Feb  5 2025 Joe Orton <jorton@redhat.com> - 11.6.0-0.3.alpha2
+- update to use tomcat9
+  Resolves: RHEL-78038
+- fix FTBFS
+
 * Mon Dec 09 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.6.0-alpha2
 - Rebase to PKI 11.6.0-alpha2