From f7115aee66d086719cdc0bcccf7ce3f8aaddda93 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:25:32 +0200 Subject: [PATCH] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- tomcat.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 0941de7..2eac613 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -86,17 +86,17 @@ Patch6: rhbz-1857043.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: ant >= 1.10.2 +BuildRequires: ant-openjdk25 >= 1.10.2 BuildRequires: ecj >= 4.20 BuildRequires: findutils -BuildRequires: java-devel >= 17 -BuildRequires: javapackages-local +BuildRequires: java-25-devel >= 17 +BuildRequires: javapackages-local-openjdk25 BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd BuildRequires: tomcat-jakartaee-migration -Requires: (java-headless >= 11 or java >= 11) +Requires: (java-headless >= 11 or java-25 >= 11) Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7