3 changed files with 78 additions and 67 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/ldap-sdk-5.4.0.tar.gz
+SOURCES/ldap-sdk-4.24.0.tar.gz
--- a/.ldapjdk.metadata
+++ b/.ldapjdk.metadata
@ -1 +1 @@
-e74c4c1e445422fe3f069c72241235e62f217d2f SOURCES/ldap-sdk-5.4.0.tar.gz
+13604a1b6bf84ee31bf99cc2304033007e92844e SOURCES/ldap-sdk-4.24.0.tar.gz
--- a/SPECS/ldapjdk.spec
+++ b/SPECS/ldapjdk.spec
@ -5,29 +5,26 @@ Name:             ldapjdk
 %global           product_id idm-ldapjdk

 # Upstream version number:
-%global           major_version 5
-%global           minor_version 4
+%global           major_version 4
+%global           minor_version 24
 %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
-
-# Development phase:
-# - development (unsupported): alpha<n> where n >= 1
-# - stabilization (unsupported): beta<n> where n >= 1
-# - GA/update (supported): <none>
-#global           phase
-
-%undefine         timestamp
-%undefine         commit_id
-
 Summary:          LDAP SDK
 URL:              https://github.com/dogtagpki/ldap-sdk
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
+
+BuildArch:        noarch
+
+# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
+# For official (i.e. supported) releases, use x.y.z-r where r >=1.
+%global           release_number 1
 Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
+#global           _phase -alpha1
+
+%global spname		ldapsp
+%global filtname	ldapfilt
+%global beansname	ldapbeans

 # To create a tarball from a version tag:
 # $ git archive \
@ -35,7 +32,7 @@ Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timesta
 #     --prefix ldap-sdk-<version>/ \
 #     -o ldap-sdk-<version>.tar.gz \
 #     <version tag>
-Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?phase}/ldap-sdk-%{version}%{?phase:-}%{?phase}.tar.gz
+Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap-sdk-%{version}%{?_phase}.tar.gz

 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@ -44,15 +41,19 @@ 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
-
 ################################################################################
 # Java
 ################################################################################

-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
+%define java_devel java-1.8.0-openjdk-devel
+%define java_headless java-1.8.0-openjdk-headless
+%define java_home /usr/lib/jvm/java-1.8.0-openjdk
+%else
+%define java_devel java-11-openjdk-devel
+%define java_headless java-11-openjdk-headless
+%define java_home /usr/lib/jvm/java-11-openjdk
+%endif

 ################################################################################
 # Build Dependencies
@ -63,7 +64,8 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-BuildRequires:    jss = 5.4
+
+BuildRequires:    jss >= 4.11.0, jss < 5.0.0

 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@ -79,7 +81,8 @@ Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
-Requires:         jss = 5.4
+
+Requires:         jss >= 4.11.0, jss < 5.0.0

 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@ -110,45 +113,57 @@ Javadoc for LDAP SDK
 %prep
 ################################################################################

-%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1
+%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
+
+# Remove all bundled jars, we must build against build-system jars
+rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar

 ################################################################################
 %build
 ################################################################################

-export JAVA_HOME=%{java_home}
+pushd java-sdk/ldapjdk/lib
+build-jar-repository -s -p . jss
+popd

-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    dist
+ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
+
+pushd java-sdk
+export JAVA_HOME=%{java_home}
+sh -x ant dist
+popd

 ################################################################################
 %install
 ################################################################################

-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    --java-lib-dir=%{_javadir} \
-    --javadoc-dir=%{_javadocdir} \
-    --install-dir=%{buildroot} \
-    install
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
+install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
+install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
+install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
+install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
+install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
+install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
+cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk

 ################################################################################
 %files -n %{product_id}
 ################################################################################

 %{_javadir}/ldapjdk.jar
-%{_javadir}/ldapsp.jar
-%{_javadir}/ldapfilt.jar
-%{_javadir}/ldapbeans.jar
-%{_javadir}/ldaptools.jar
+%{_javadir}/%{spname}*.jar
+%{_javadir}/%{filtname}*.jar
+%{_javadir}/%{beansname}*.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
@ -159,34 +174,30 @@ export JAVA_HOME=%{java_home}

 ################################################################################
 %changelog
-* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.0-1
- Rebase to LDAP SDK 5.4.0
+* Wed Apr 03 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.24.0-1
+- Rebuilt for MSVSphere 8.10 beta

-* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-1
- Rebase to LDAP SDK 5.3.0
+* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-1
+- Rebase to LDAP SDK 4.24.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
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-0.1
+- Rebase to LDAP SDK 4.24.0-alpha1

-* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
- Rebase to LDAP SDK 5.2.0
+* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
+- Rebase to LDAP SDK 4.23.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
+* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-0.1
+- Rebase to LDAP SDK 4.23.0-alpha1

-* 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 May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.22.0-1
+- Rebase to LDAP SDK 4.22.0

-* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
- Rebase to LDAP SDK 5.0.0
+* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-2
+- Bump min required JSS version to 4.6.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 Jun 10 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-1
+- Rebase to LDAP SDK 4.21.0

-* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
- Drop javadoc package
+* Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
+- Rebase to LDAP SDK 4.20.0

-* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
- Rebase to LDAP SDK 5.0.0-alpha1