From 1b2f8ef6d9758b5c17b1196d8fe7dc9a61e24e77 Mon Sep 17 00:00:00 2001
From: dsoumis <dsoumis@redhat.com>
Date: Fri, 12 Sep 2025 17:29:22 +0300
Subject: [PATCH 1/2] Update to 10.1.46 upstream release

---
 sources     | 2 +-
 tomcat.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 6eba8ed..4027ead 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-tomcat-10.1.43-src.tar.gz) = 24672a4ea4d6e0bfd5e7dbb8694f260216bea47f21c347dd549d3e0851915aa7616695356cbf6714780ff1527f346ad2119f7f52f66779c4d0510ad0f83e9978
+SHA512 (apache-tomcat-10.1.46-src.tar.gz) = 4abb5a5fad013135c4107508e4530673e4af623658b6aff5c4fc18fd557dfca37b58a9c5c0479e52e240b53d469ad91a34225a80b718aa2f91b8d385d16d9682
diff --git a/tomcat.spec b/tomcat.spec
index c79da3b..6a1425a 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 3.1
 %global major_version 10
 %global minor_version 1
-%global micro_version 43
+%global micro_version 46
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 6.0
 %global elspec 5.0
@@ -523,6 +523,9 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf
 %{appdir}/ROOT
 
 %changelog
+* Fri Sep 12 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.46-1
+- Update to version 10.1.46
+
 * Tue Aug 19 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.43-7
 - Add virtual provides to resolve installability issues
 

From b6246accae8953d404005d1bb81b8e67a79dabd1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 25 Sep 2025 11:10:06 -0700
Subject: [PATCH 2/2] Fix java requirements (#2398212)

With java-latest now being 25, but only java-25 providing the
generic 'java' and 'java-headless' etc., we get file conflicts
if a transaction includes both things that want 'java-25' or
'java-25-headless' and things that want 'java' or 'java-headless'.
This is because dnf prefers java-latest as a provider of the
java-25-* provides (it's versioned higher than the java-25
packages), but only the java-25 packages provide the generic
requirements.

To avoid this making FreeIPA uninstallable, let's get rid of the
generic 'java-headless' requirement. I think f7115aee was meant
to do this already, but missed it.

Also get rid of the now-useless version bounds on requirements
where the java version is included in the requirement name.
---
 tomcat.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 6a1425a..77901bc 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -89,14 +89,14 @@ ExclusiveArch:  %{java_arches} noarch
 BuildRequires: ant-openjdk25  >= 1.10.2
 BuildRequires: ecj >= 4.20
 BuildRequires: findutils
-BuildRequires: java-25-devel >= 17
+BuildRequires: java-25-devel
 BuildRequires: javapackages-local-openjdk25
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
 BuildRequires: systemd
 BuildRequires: tomcat-jakartaee-migration
 
-Requires:      (java-headless >= 11 or java-25 >= 11)
+Requires:      (java-25-headless or java-25)
 Requires:      javapackages-tools
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -523,6 +523,10 @@ install -m0644 -D tomcat.sysusers.conf %{buildroot}%{_sysusersdir}/tomcat.conf
 %{appdir}/ROOT
 
 %changelog
+* Thu Sep 25 2025 Adam Williamson <awilliam@redhat.com> - 1:10.1.46-2
+- Drop now-unnecessary version bounds in java requirements
+- Specify java-25-headless, not java-headless (#2398212)
+
 * Fri Sep 12 2025 Dimitris Soumis <dsoumis@redhat.com> - 1:10.1.46-1
 - Update to version 10.1.46