From 77cd7ee1072b5eb9823811b3544f622aa1bf7547 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Tue, 15 Aug 2023 20:18:08 +0800
Subject: [PATCH] Resolves: #2173874 Tomcat installs older java even though
 newer java is installed Sync with rhel-8.8.0 branch

---
 .fmf/version             |  1 +
 ci.fmf                   |  1 +
 plans/tier1-internal.fmf | 11 +++++++
 plans/tier1-public.fmf   |  7 +++++
 tomcat.spec              | 62 +++++++++++++++++++++++++++++++---------
 5 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 create mode 100644 plans/tier1-internal.fmf
 create mode 100644 plans/tier1-public.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..ab09f4a
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,11 @@
+summary: Internal Tier1 beakerlib tests.
+discover:
+  - name: rhel
+    how: fmf
+    url: git://pkgs.devel.redhat.com/tests/tomcat
+    filter: 'tier: 1'
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-9
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
new file mode 100644
index 0000000..f766786
--- /dev/null
+++ b/plans/tier1-public.fmf
@@ -0,0 +1,7 @@
+summary: Public Tier1 beakerlib tests
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/tomcat.git
+    filter: 'tier: 1'
+execute:
+    how: tmt
diff --git a/tomcat.spec b/tomcat.spec
index 68f7997..421ee6d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -90,15 +90,14 @@ Patch8:        fix-malformed-dtd.patch
 BuildArch:     noarch
 
 BuildRequires: ant
-BuildRequires: ecj >= 1:4.10
+BuildRequires: ecj
 BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
 BuildRequires: javapackages-local
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
 BuildRequires: systemd
 
-Requires:      java-headless >= 1:1.8.0
+Requires:      (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8)
 Requires:      javapackages-tools
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -125,6 +124,33 @@ Tomcat is developed in an open and participatory environment and
 released under the Apache Software License version 2.0. Tomcat is intended
 to be a collaboration of the best-of-breed developers from around the world.
 
+%package java-jdk8
+Group: Development/Java
+Summary: Tomcat on JDK 8
+Requires: java-1.8.0 >= 1:1.8
+Provides: tomcat-java = %{epoch}:%{version}-%{release}
+
+%description java-jdk8
+Tomcat on JDK  8
+
+%package java-jdk11
+Group: Development/Java
+Summary: Tomcat on JDK 11
+Requires: (java-11 or java-11-headless)
+Provides: tomcat-java = %{epoch}:%{version}-%{release}
+
+%description java-jdk11
+Tomcat on JDK  11
+
+%package java-jdk17
+Group: Development/Java
+Summary: Tomcat on JDK 17
+Requires: (java-17 or java-17-headless)
+Provides: tomcat-java = %{epoch}:%{version}-%{release}
+
+%description java-jdk17
+Tomcat on JDK  17
+
 %package admin-webapps
 Summary: The host-manager and manager web applications for Apache Tomcat
 Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -195,15 +221,15 @@ The ROOT web application for Apache Tomcat.
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch -P0 -p0
+%patch -P1 -p0
+%patch -P2 -p0
+%patch -P3 -p0
+%patch -P4 -p0
+%patch -P5 -p0
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
@@ -506,8 +532,18 @@ fi
 %defattr(0644,tomcat,tomcat,0755)
 %{appdir}/ROOT
 
+%files java-jdk8
+
+%files java-jdk11
+
+%files java-jdk17
+
 
 %changelog
+* Fri Aug 11 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-6
+- Resolves: #2173874 Tomcat installs older java even though newer java is installed
+- Sync with rhel-8.8.0 branch
+
 * Thu Feb 16 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-5
 - Related: #2160455 Add conflicts to subpackage