From 391fa7806705e150dd8585396919c88d557f83d9 Mon Sep 17 00:00:00 2001
From: Jack Magne <jmagne@redhat.com>
Date: Wed, 5 Mar 2025 17:15:59 -0800
Subject: [PATCH] Rebase LDAP SDK to 5.6.0.

---
 .gitignore   |  1 +
 ldapjdk.spec | 29 +++++++++++++++++++++++++----
 sources      |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73201cc..dfa1e6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ ldapjdk-4.18.tar.gz
 /ldap-sdk-5.5.0-alpha2.tar.gz
 /ldap-sdk-5.5.0.tar.gz
 /ldap-sdk-5.6.0-alpha1.tar.gz
+/ldap-sdk-5.6.0.tar.gz
diff --git a/ldapjdk.spec b/ldapjdk.spec
index 8c3bb81..fe786ea 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -13,13 +13,13 @@ Name:             ldapjdk
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 0.1
+%global           release_number 1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global           phase alpha1
+#global           phase alpha1
 
 %undefine         timestamp
 %undefine         commit_id
@@ -28,7 +28,7 @@ Summary:          LDAP SDK
 URL:              https://github.com/dogtagpki/ldap-sdk
 License:          MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later
 Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -54,16 +54,34 @@ 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
+
 ################################################################################
 # Build Dependencies
 ################################################################################
 
 BuildRequires:    ant
 BuildRequires:    %{java_devel}
-BuildRequires:    maven-local
+BuildRequires:    %{maven_local}
 BuildRequires:    mvn(org.slf4j:slf4j-api)
 BuildRequires:    mvn(org.slf4j:slf4j-jdk14)
 BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
@@ -160,6 +178,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
 %changelog
+* Thu Mar 20 2025  Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.6.0-1
+- Rebase to LDAP SDK 5.6.0
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.1.alpha1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
diff --git a/sources b/sources
index d06af5a..fc04926 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa
+SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d