.gitignore

@@ -1 +1 @@
-SOURCES/ldap-sdk-5.4.0.tar.gz
+SOURCES/ldap-sdk-5.5.0.tar.gz

.ldapjdk.metadata

@@ -1 +1 @@
-e74c4c1e445422fe3f069c72241235e62f217d2f SOURCES/ldap-sdk-5.4.0.tar.gz
+e768bb087a0f72e81b17d90eb1a37fb900fabf6e SOURCES/ldap-sdk-5.5.0.tar.gz

SPECS/ldapjdk.spec

@@ -6,13 +6,13 @@ Name:             ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 4
+%global           minor_version 5
 %global           update_version 0
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 1
+%global           release_number 3
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -25,7 +25,7 @@ Name:             ldapjdk
 
 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,14 +45,17 @@ 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_devel java-devel
-%define java_headless java-17-openjdk-headless
+%define java_headless java-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%define java_home %{_jvmdir}/jre-openjdk
 
 ################################################################################
 # Build Dependencies
@@ -60,10 +63,10 @@ BuildArch:        noarch
 
 BuildRequires:    ant
 BuildRequires:    %{java_devel}
-BuildRequires:    javapackages-local
+BuildRequires:    maven-local
-BuildRequires:    slf4j
+BuildRequires:    mvn(org.slf4j:slf4j-api)
-BuildRequires:    slf4j-jdk14
+BuildRequires:    mvn(org.slf4j:slf4j-jdk14)
-BuildRequires:    jss = 5.4
+BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -76,10 +79,9 @@ manage, and update the information stored in an LDAP directory.
 Summary:          LDAP SDK
 
 Requires:         %{java_headless}
-Requires:         jpackage-utils >= 0:1.5
+Requires:         mvn(org.slf4j:slf4j-api)
-Requires:         slf4j
+Requires:         mvn(org.slf4j:slf4j-jdk14)
-Requires:         slf4j-jdk14
+Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
-Requires:         jss = 5.4
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@@ -112,38 +114,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 \
+%mvn_build
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    dist
 
 ################################################################################
 %install
 ################################################################################
 
-./build.sh \
+%mvn_install
-    %{?_verbose:-v} \
+
-    --work-dir=%{_vpath_builddir} \
+ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
-    --java-lib-dir=%{_javadir} \
+ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
-    --javadoc-dir=%{_javadocdir} \
+ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
-    --install-dir=%{buildroot} \
+ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
-    install
+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
@@ -151,42 +155,18 @@ 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
-* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.0-1
+* Wed Aug 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 5.5.0-3
-- Rebase to LDAP SDK 5.4.0
+- Rebuilt with java-21-openjdk as default JDK:
-
+  https://issues.redhat.com/browse/RHEL-34597
-* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-1
+- Resolves: RHEL-54333
-- Rebase to LDAP SDK 5.3.0
-
-* Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-0.2.beta1
-- Rebase to LDAP SDK 5.3.0-beta1
-
-* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
-- Rebase to LDAP SDK 5.2.0
-
-* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2
-- Rebase to LDAP SDK 5.2.0-beta2
-- Rename packages to idm-ldapjdk
-
-* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
-- Rebase to LDAP SDK 5.2.0-beta1
-
-* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
-- Rebase to LDAP SDK 5.0.0
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
 
-* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-2.1
-- Drop javadoc package
+- Bump release for June 2024 mass rebuild
 
-* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
+* Fri May 10 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-2
-- Rebase to LDAP SDK 5.0.0-alpha1
+- Rebase to LDAP SDK 5.5.0