.gitignore

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

.ldapjdk.metadata

@@ -1 +1 @@
-c56d68eb01fa3e0873a70317048d46addec89300 SOURCES/ldap-sdk-4.23.0.tar.gz
+e74c4c1e445422fe3f069c72241235e62f217d2f SOURCES/ldap-sdk-5.4.0.tar.gz

SPECS/ldapjdk.spec

@@ -2,21 +2,32 @@
 Name:             ldapjdk
 ################################################################################
 
-Summary:          LDAP SDK
+%global           product_id idm-ldapjdk
-URL:              http://www.dogtagpki.org/
-License:          MPLv1.1 or GPLv2+ or LGPLv2+
 
-BuildArch:        noarch
+# Upstream version number:
+%global           major_version 5
+%global           minor_version 4
+%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
 
-# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
+# Development phase:
-# For official (i.e. supported) releases, use x.y.z-r where r >=1.
+# - development (unsupported): alpha<n> where n >= 1
-Version:          4.23.0
+# - stabilization (unsupported): beta<n> where n >= 1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+# - GA/update (supported): <none>
-#global           _phase -alpha1
+#global           phase
 
-%global spname		ldapsp
+%undefine         timestamp
-%global filtname	ldapfilt
+%undefine         commit_id
-%global beansname	ldapbeans
+
+Summary:          LDAP SDK
+URL:              https://github.com/dogtagpki/ldap-sdk
+License:          MPLv1.1 or GPLv2+ or LGPLv2+
+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 \
@@ -24,7 +35,7 @@ Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 #     --prefix ldap-sdk-<version>/ \
 #     -o ldap-sdk-<version>.tar.gz \
 #     <version tag>
-Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap-sdk-%{version}%{?_phase}.tar.gz
+Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?phase}/ldap-sdk-%{version}%{?phase:-}%{?phase}.tar.gz
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -33,19 +44,15 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap
 #     > ldap-sdk-VERSION-RELEASE.patch
 # Patch: ldap-sdk-VERSION-RELEASE.patch
 
+BuildArch:        noarch
+
 ################################################################################
 # Java
 ################################################################################
 
-%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
+%define java_devel java-17-openjdk-devel
-%define java_devel java-1.8.0-openjdk-devel
+%define java_headless java-17-openjdk-headless
-%define java_headless java-1.8.0-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
-%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
@@ -56,116 +63,130 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+BuildRequires:    jss = 5.4
+
+%description
+The Mozilla LDAP SDKs enable you to write applications which access,
+manage, and update the information stored in an LDAP directory.
 
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          LDAP SDK
+
 Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss = 5.4
 
-%description
+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,
 manage, and update the information stored in an LDAP directory.
 
 %license docs/ldapjdk/license.txt
 
 ################################################################################
-%package javadoc
+%package -n %{product_id}-javadoc
 ################################################################################
 
-Summary:        Javadoc for %{name}
+Summary:          Javadoc for LDAP SDK
 
-%description javadoc
+Obsoletes:        ldapjdk-javadoc < %{version}-%{release}
-Javadoc for %{name}
+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
 
 ################################################################################
 %prep
 ################################################################################
 
-%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
+%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?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
 ################################################################################
 
-pushd java-sdk/ldapjdk/lib
-build-jar-repository -s -p . jss
-popd
-
-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
+./build.sh \
+    %{?_verbose:-v} \
+    --work-dir=%{_vpath_builddir} \
+    dist
 
 ################################################################################
 %install
 ################################################################################
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+./build.sh \
-install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+    %{?_verbose:-v} \
-install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
+    --work-dir=%{_vpath_builddir} \
-install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
+    --java-lib-dir=%{_javadir} \
-install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
+    --javadoc-dir=%{_javadocdir} \
-
+    --install-dir=%{buildroot} \
-mkdir -p %{buildroot}%{_mavenpomdir}
+    install
-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}/%{name}
-cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
-%{_javadir}/%{name}.jar
+%{_javadir}/ldapjdk.jar
-%{_javadir}/%{spname}*.jar
+%{_javadir}/ldapsp.jar
-%{_javadir}/%{filtname}*.jar
+%{_javadir}/ldapfilt.jar
-%{_javadir}/%{beansname}*.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 javadoc
+%files -n %{product_id}-javadoc
 ################################################################################
 
-%dir %{_javadocdir}/%{name}
+%dir %{_javadocdir}/ldapjdk
-%{_javadocdir}/%{name}/*
+%{_javadocdir}/ldapjdk/*
 
 ################################################################################
 %changelog
-* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.23.0-1
+* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.0-1
-- Rebuilt for MSVSphere 8.8
+- Rebase to LDAP SDK 5.4.0
+
+* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-1
+- 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
 
-* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
+* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
-- Rebase to LDAP SDK 4.23.0
+- Rebase to LDAP SDK 5.2.0
 
-* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-0.1
+* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2
-- Rebase to LDAP SDK 4.23.0-alpha1
+- Rebase to LDAP SDK 5.2.0-beta2
+- Rename packages to idm-ldapjdk
 
-* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.22.0-1
+* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
-- Rebase to LDAP SDK 4.22.0
+- Rebase to LDAP SDK 5.2.0-beta1
 
-* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-2
+* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
-- Bump min required JSS version to 4.6.0
+- Rebase to LDAP SDK 5.0.0
 
-* Mon Jun 10 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
-- Rebase to LDAP SDK 4.21.0
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
+* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
-- Rebase to LDAP SDK 4.20.0
+- Drop javadoc package
 
+* 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