From 2b479204acb28bb0927abcd2c5a15cf0f735415b Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edewata@redhat.com>
Date: Feb 22 2024 00:21:30 +0000
Subject: Rebase to LDAP SDK 5.5.0


---

diff --git a/.gitignore b/.gitignore
index 767c828..22372bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ ldapjdk-4.18.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
diff --git a/ldapjdk.spec b/ldapjdk.spec
index 8f2963e..0848cea 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -6,8 +6,8 @@ Name:             ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 4
-%global           update_version 1
+%global           minor_version 5
+%global           update_version 0
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
@@ -26,8 +26,8 @@ Name:             ldapjdk
 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:          5.4.1
-Release:          4%{?dist}
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -63,10 +63,10 @@ ExclusiveArch:    %{java_arches} noarch
 
 BuildRequires:    ant
 BuildRequires:    %{java_devel}
-BuildRequires:    javapackages-local
-BuildRequires:    slf4j
-BuildRequires:    slf4j-jdk14
-BuildRequires:    jss = 5.4
+BuildRequires:    maven-local
+BuildRequires:    mvn(org.slf4j:slf4j-api)
+BuildRequires:    mvn(org.slf4j:slf4j-jdk14)
+BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -79,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:         slf4j
-Requires:         slf4j-jdk14
-Requires:         jss = 5.4
+Requires:         mvn(org.slf4j:slf4j-api)
+Requires:         mvn(org.slf4j:slf4j-jdk14)
+Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@@ -115,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 \
-    %{?_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
@@ -154,14 +155,14 @@ 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
+* 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
 
diff --git a/sources b/sources
index a96f12a..77779dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ldap-sdk-5.4.1.tar.gz) = f63d2f309284bb27d5e2d5714e310f1f5df97eb77883b741b4c9dd69f044428da9907e278b776b12a6891790631daffa604c3e82c7dfe1e6c81edab3702e9896
+SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59