.gitignore

@@ -1 +1 @@
-SOURCES/ldap-sdk-5.2.0.tar.gz
+SOURCES/ldap-sdk-4.24.0.tar.gz

.ldapjdk.metadata

@@ -1 +1 @@
-528725334ea80bf159fc4aa0450df171290a471a SOURCES/ldap-sdk-5.2.0.tar.gz
+5ae502d4aec13f94d581384faedf2fa67d87cffa SOURCES/ldap-sdk-4.24.0.tar.gz

SPECS/ldapjdk.spec

@@ -5,30 +5,26 @@ Name:             ldapjdk
 %global           product_id idm-ldapjdk
 
 # Upstream version number:
-%global           major_version 5
+%global           major_version 4
-%global           minor_version 2
+%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>
-%undefine         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 \
@@ -36,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 \
@@ -49,9 +45,15 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p
 # Java
 ################################################################################
 
-%define java_devel java-17-openjdk-devel
+%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
-%define java_headless java-17-openjdk-headless
+%define java_devel java-1.8.0-openjdk-devel
-%define java_home %{_jvmdir}/jre-17-openjdk
+%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
@@ -62,7 +64,8 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-BuildRequires:    jss >= 5.2.0
+
+BuildRequires:    jss >= 4.11.0, jss < 5.0.0
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -78,10 +81,13 @@ Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
-Requires:         jss >= 5.2.0
+
+Requires:         jss >= 4.11.0, jss < 5.0.0
 
 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,
@@ -97,6 +103,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
@@ -105,39 +113,53 @@ 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 \
+ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
-    %{?_verbose:-v} \
+
-    --work-dir=%{_vpath_builddir} \
+pushd java-sdk
-    dist
+export JAVA_HOME=%{java_home}
+sh -x ant dist
+popd
 
 ################################################################################
 %install
 ################################################################################
 
-./build.sh \
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-    %{?_verbose:-v} \
+install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
-    --work-dir=%{_vpath_builddir} \
+install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
-    --java-lib-dir=%{_javadir} \
+install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
-    --javadoc-dir=%{_javadocdir} \
+install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
-    --install-dir=%{buildroot} \
+
-    install
+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}/%{spname}*.jar
-%{_javadir}/ldapfilt.jar
+%{_javadir}/%{filtname}*.jar
-%{_javadir}/ldapbeans.jar
+%{_javadir}/%{beansname}*.jar
 %{_mavenpomdir}/JPP-ldapjdk.pom
 %{_mavenpomdir}/JPP-ldapsp.pom
 %{_mavenpomdir}/JPP-ldapfilter.pom
@@ -152,25 +174,26 @@ export JAVA_HOME=%{java_home}
 
 ################################################################################
 %changelog
-* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
+* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-1
-- Rebase to LDAP SDK 5.2.0
+- Rebase to LDAP SDK 4.24.0
 
-* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-0.1
-- Rebase to LDAP SDK 5.2.0-beta2
+- Rebase to LDAP SDK 4.24.0-alpha1
-- Rename packages to idm-ldapjdk
 
-* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
+* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
-- Rebase to LDAP SDK 5.2.0-beta1
+- Rebase to LDAP SDK 4.23.0
 
-* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
+* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-0.1
-- Rebase to LDAP SDK 5.0.0
+- Rebase to LDAP SDK 4.23.0-alpha1
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
+* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.22.0-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebase to LDAP SDK 4.22.0
-  Related: rhbz#1991688
 
-* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
+* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-2
-- Drop javadoc package
+- Bump min required JSS version to 4.6.0
 
-* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
+* Mon Jun 10 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-1
-- Rebase to LDAP SDK 5.0.0-alpha1
+- Rebase to LDAP SDK 4.21.0
+
+* Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
+- Rebase to LDAP SDK 4.20.0