Rebase LDAP SDK to 5.6.0.

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.

.gitignore

@@ -12,3 +12,8 @@ ldapjdk-4.18.tar.gz
 /ldap-sdk-5.2.0-beta2.tar.gz
 /ldap-sdk-5.2.0.tar.gz
 /ldap-sdk-5.3.0.tar.gz
+/ldap-sdk-5.4.1.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

.packit.yaml

@@ -0,0 +1,30 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+specfile_path: ldapjdk.spec
+
+# add or remove files that should be synced
+files_to_sync:
+  - ldapjdk.spec
+  - .packit.yaml
+
+# Allow dist git reactions on packit and ckelley commits and PRs
+allowed_pr_authors:
+  - packit
+  - ckelleyRH
+allowed_committers:
+  - packit
+  - ckelleyRH
+
+upstream_package_name: ldap-sdk
+# downstream (Fedora/CentOS) RPM package name
+downstream_package_name: ldapjdk
+# see: https://packit.dev/docs/configuration/#upstream_tag_template
+upstream_tag_template: "v{version}"
+
+jobs:
+  - job: propose_downstream
+    trigger: release
+    dist_git_branches:
+      - fedora-development
+#     - centos-stream-9-x86_64 # When Packit integration with CentOS is avaiable, enable this

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.76.0.post10+g0dcb396.

ldapjdk.spec

@@ -2,11 +2,12 @@
 Name:             ldapjdk
 ################################################################################
 
-%global           product_id dogtag-ldapjdk
+%global           vendor_id dogtag
+%global           product_id %{vendor_id}-ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 3
+%global           minor_version 6
 %global           update_version 0
 
 # Downstream release number:
@@ -18,14 +19,14 @@ Name:             ldapjdk
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-#global           phase
+#global           phase alpha1
 
 %undefine         timestamp
 %undefine         commit_id
 
 Summary:          LDAP SDK
 URL:              https://github.com/dogtagpki/ldap-sdk
-License:          MPLv1.1 or GPLv2+ or LGPLv2+
+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}
 
@@ -45,26 +46,29 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p
 # Patch: ldap-sdk-VERSION-RELEASE.patch
 
 BuildArch:        noarch
+%if 0%{?java_arches:1}
 ExclusiveArch:    %{java_arches} noarch
+%endif
 
 ################################################################################
 # Java
 ################################################################################
 
-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%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:    javapackages-local
-BuildRequires:    slf4j
-BuildRequires:    slf4j-jdk14
-BuildRequires:    jss = 5.3
+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
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -77,10 +81,9 @@ manage, and update the information stored in an LDAP directory.
 Summary:          LDAP SDK
 
 Requires:         %{java_headless}
-Requires:         jpackage-utils >= 0:1.5
-Requires:         slf4j
-Requires:         slf4j-jdk14
-Requires:         jss = 5.3
+Requires:         mvn(org.slf4j:slf4j-api)
+Requires:         mvn(org.slf4j:slf4j-jdk14)
+Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@@ -113,38 +116,40 @@ Javadoc for LDAP SDK
 
 %autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1
 
+# flatten-maven-plugin is not available in RPM
+%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
+
+# specify Maven artifact locations
+%mvn_file org.dogtagpki.ldap-sdk:ldapjdk     ldapjdk/ldapjdk    ldapjdk
+%mvn_file org.dogtagpki.ldap-sdk:ldapbeans   ldapjdk/ldapbeans  ldapbeans
+%mvn_file org.dogtagpki.ldap-sdk:ldapfilter  ldapjdk/ldapfilter ldapfilt
+%mvn_file org.dogtagpki.ldap-sdk:ldapsp      ldapjdk/ldapsp     ldapsp
+%mvn_file org.dogtagpki.ldap-sdk:ldaptools   ldapjdk/ldaptools  ldaptools
+
 ################################################################################
 %build
 ################################################################################
 
 export JAVA_HOME=%{java_home}
 
-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    dist
+%mvn_build
 
 ################################################################################
 %install
 ################################################################################
 
-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    --java-lib-dir=%{_javadir} \
-    --javadoc-dir=%{_javadocdir} \
-    --install-dir=%{buildroot} \
-    install
+%mvn_install
+
+ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
+ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
+ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
+ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
+ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
-%files -n %{product_id}
+%files -n %{product_id} -f .mfiles
 ################################################################################
 
-%{_javadir}/ldapjdk.jar
-%{_javadir}/ldapsp.jar
-%{_javadir}/ldapfilt.jar
-%{_javadir}/ldapbeans.jar
-%{_javadir}/ldaptools.jar
 %{_mavenpomdir}/JPP-ldapjdk.pom
 %{_mavenpomdir}/JPP-ldapsp.pom
 %{_mavenpomdir}/JPP-ldapfilter.pom
@@ -152,14 +157,55 @@ export JAVA_HOME=%{java_home}
 %{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
-%files -n %{product_id}-javadoc
+%files -n %{product_id}-javadoc -f .mfiles-javadoc
 ################################################################################
 
-%dir %{_javadocdir}/ldapjdk
-%{_javadocdir}/ldapjdk/*
-
 ################################################################################
 %changelog
+* Tue Nov 04 2025  Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.6.0-1
+- Rebase to LDAP SDK 5.6.0
+
+* Wed Jul 30 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 5.6.0-0.1.alpha1.4
+- Really rebuilt for java-25-openjdk as system jdk
+
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 5.6.0-0.1.alpha1.3
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.1.alpha1.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* 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
+
+* Wed Nov 20 2024 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.5.0-0.1
+- Rebase to LDAP SDK 5.6.0-alpha1
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sun Mar 03 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 5.5.0-2
+- Really rebuilt for java-21-openjdk as system jdk
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 5.5.0-1.1
+- Rebuilt for java-21-openjdk as system jdk
+
+* Wed Feb 21 2024 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.5.0-1
+- Rebase to LDAP SDK 5.5.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Packit <hello@packit.dev> - 5.4.1-1
+- Updating version to v5.4.1 (Chris Kelley)
+- Upstream some spec file changes from Fedora to minimise diff (Chris Kelley)
+- Introduce Packit configuration for ldapjdk (Chris Kelley)
+
 * Tue Feb 07 2023 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.3.0-1
 - Rebase to LDAP SDK 5.3.0
 

sources

@@ -1 +1 @@
-SHA512 (ldap-sdk-5.3.0.tar.gz) = ee8e757cb5561c0a43b8a180f100a65c3615d2218ec4bfcb547c9e88d1b08213adabf0fe3e6b5f7ac7dea04c6719da6b7f456a422ab9f6787390a1c3a2f3fc3e
+SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d