diff --git a/ldapjdk.spec b/ldapjdk.spec index fe786ea..eb973a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -54,32 +54,16 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -# use Java 17 on Fedora 39 or older and RHEL 9 or older -# otherwise, use Java 21 - -# maven-local is a subpackage of javapackages-tools - -%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9 - -%define java_devel java-17-openjdk-devel -%define java_headless java-17-openjdk-headless -%define java_home %{_jvmdir}/jre-17-openjdk -%define maven_local maven-local-openjdk17 - -%else - -%define java_devel java-21-openjdk-devel -%define java_headless java-21-openjdk-headless -%define java_home %{_jvmdir}/jre-21-openjdk -%define maven_local maven-local - -%endif +%define java_devel java-25-openjdk-devel +%define java_headless java-25-openjdk-headless +%define java_home %{_jvmdir}/jre-25-openjdk +%define maven_local maven-local-openjdk25 ################################################################################ # Build Dependencies ################################################################################ -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: %{java_devel} BuildRequires: %{maven_local} BuildRequires: mvn(org.slf4j:slf4j-api) @@ -178,9 +162,18 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog -* Thu Mar 20 2025 Dogtag PKI Team - 5.6.0-1 +* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 - Rebase to LDAP SDK 5.6.0 +* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 +- Really rebuilt for java-25-openjdk as system jdk + +* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 +- Rebuilt for java-25-openjdk as preffered jdk + +* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild