From a1e0ff364c4fa3d1aafbeae7d620527d3873c5ff Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 7 Feb 2023 13:58:32 -0600
Subject: [PATCH] Rebase to LDAP SDK 5.3.0

---
 .gitignore   |  1 +
 ldapjdk.spec | 24 +++++++++++++++++-------
 sources      |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5b02ce..459a3e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ ldapjdk-4.18.tar.gz
 /ldap-sdk-5.2.0-beta1.tar.gz
 /ldap-sdk-5.2.0-beta2.tar.gz
 /ldap-sdk-5.2.0.tar.gz
+/ldap-sdk-5.3.0.tar.gz
diff --git a/ldapjdk.spec b/ldapjdk.spec
index a68fc20..6a0944b 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -6,7 +6,7 @@ Name:             ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 2
+%global           minor_version 3
 %global           update_version 0
 
 # Downstream release number:
@@ -18,7 +18,7 @@ Name:             ldapjdk
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%undefine         phase
+#global           phase
 
 %undefine         timestamp
 %undefine         commit_id
@@ -26,10 +26,8 @@ Name:             ldapjdk
 Summary:          LDAP SDK
 URL:              https://github.com/dogtagpki/ldap-sdk
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
-BuildArch:        noarch
-ExclusiveArch:  %{java_arches} noarch
 Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -46,6 +44,9 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p
 #     > ldap-sdk-VERSION-RELEASE.patch
 # Patch: ldap-sdk-VERSION-RELEASE.patch
 
+BuildArch:        noarch
+ExclusiveArch:    %{java_arches} noarch
+
 ################################################################################
 # Java
 ################################################################################
@@ -63,7 +64,7 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-BuildRequires:    jss >= 5.2.0
+BuildRequires:    jss = 5.3
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -79,10 +80,12 @@ Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
-Requires:         jss >= 5.2.0
+Requires:         jss = 5.3
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
+Provides:         ldapjdk = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
 
 %description -n %{product_id}
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -98,6 +101,8 @@ Summary:          Javadoc for LDAP SDK
 
 Obsoletes:        ldapjdk-javadoc < %{version}-%{release}
 Provides:         ldapjdk-javadoc = %{version}-%{release}
+Provides:         ldapjdk-javadoc = %{major_version}.%{minor_version}
+Provides:         %{product_id}-javadoc = %{major_version}.%{minor_version}
 
 %description -n %{product_id}-javadoc
 Javadoc for LDAP SDK
@@ -139,10 +144,12 @@ export JAVA_HOME=%{java_home}
 %{_javadir}/ldapsp.jar
 %{_javadir}/ldapfilt.jar
 %{_javadir}/ldapbeans.jar
+%{_javadir}/ldaptools.jar
 %{_mavenpomdir}/JPP-ldapjdk.pom
 %{_mavenpomdir}/JPP-ldapsp.pom
 %{_mavenpomdir}/JPP-ldapfilter.pom
 %{_mavenpomdir}/JPP-ldapbeans.pom
+%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
 %files -n %{product_id}-javadoc
@@ -153,6 +160,9 @@ export JAVA_HOME=%{java_home}
 
 ################################################################################
 %changelog
+* Tue Feb 07 2023 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.3.0-1
+- Rebase to LDAP SDK 5.3.0
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 28b54ff..ecfddf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ldap-sdk-5.2.0.tar.gz) = 8799375fac34d2099601827b08c06f14a40f41f4b119bffab9e052cfa16d1b4b9758e231bac220c617ca4e07a32106f21308615a63a23bb66e0f55a1d992c3bb
+SHA512 (ldap-sdk-5.3.0.tar.gz) = ee8e757cb5561c0a43b8a180f100a65c3615d2218ec4bfcb547c9e88d1b08213adabf0fe3e6b5f7ac7dea04c6719da6b7f456a422ab9f6787390a1c3a2f3fc3e