From 3db96c3f9de4343b9ef3fd0b52d5bade2e667c6f Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Sep 13 2023 08:11:49 +0000
Subject: Update to 9.0.80


---

diff --git a/sources b/sources
index fcff246..2068d0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-tomcat-9.0.78-src.tar.gz) = 220bf46004c4cbad536a7040c979651ee49a13994cf83045369c1bfdc0a96c0172ddc8fd24ab76c9526591c50033d915dbd258939b24d22d660050dcb5abcad4
+SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
diff --git a/tomcat.spec b/tomcat.spec
index 4bdbdac..4abe9ab 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.3
 %global major_version 9
 %global minor_version 0
-%global micro_version 78
+%global micro_version 80
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 4.0
 %global elspec 3.0
@@ -94,7 +94,7 @@ 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
@@ -550,6 +550,10 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Wed Sep 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.80-1
+- Update to 9.0.80
+- Fix java version
+
 * Wed Jul 26 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-1
 - Fix duplicated jars in the tomcat lib subpackage