.gitignore

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

.ldapjdk.metadata

@@ -1 +1 @@
-7ccd2e41aba7f9aee665a67f1c6a79d745393ac7 SOURCES/ldap-sdk-5.6.0-alpha1.tar.gz
+e74c4c1e445422fe3f069c72241235e62f217d2f SOURCES/ldap-sdk-5.4.0.tar.gz

SPECS/ldapjdk.spec

@@ -2,31 +2,30 @@
 Name:             ldapjdk
 ################################################################################
 
-%global           vendor_id idm
+%global           product_id idm-ldapjdk
-%global           product_id %{vendor_id}-ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 6
+%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 0.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 alpha1
+#global           phase
 
 %undefine         timestamp
 %undefine         commit_id
 
 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
+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}
 
@@ -46,17 +45,14 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p
 # Patch: ldap-sdk-VERSION-RELEASE.patch
 
 BuildArch:        noarch
-%if 0%{?java_arches:1}
-ExclusiveArch:    %{java_arches} noarch
-%endif
 
 ################################################################################
 # Java
 ################################################################################
 
-%define java_devel java-21-openjdk-devel
+%define java_devel java-17-openjdk-devel
-%define java_headless java-21-openjdk-headless
+%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-21-openjdk
+%define java_home %{_jvmdir}/jre-17-openjdk
 
 ################################################################################
 # Build Dependencies
@@ -64,10 +60,10 @@ ExclusiveArch:    %{java_arches} noarch
 
 BuildRequires:    ant
 BuildRequires:    %{java_devel}
-BuildRequires:    maven-local
+BuildRequires:    javapackages-local
-BuildRequires:    mvn(org.slf4j:slf4j-api)
+BuildRequires:    slf4j
-BuildRequires:    mvn(org.slf4j:slf4j-jdk14)
+BuildRequires:    slf4j-jdk14
-BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
+BuildRequires:    jss = 5.4
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -80,9 +76,10 @@ manage, and update the information stored in an LDAP directory.
 Summary:          LDAP SDK
 
 Requires:         %{java_headless}
-Requires:         mvn(org.slf4j:slf4j-api)
+Requires:         jpackage-utils >= 0:1.5
-Requires:         mvn(org.slf4j:slf4j-jdk14)
+Requires:         slf4j
-Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
+Requires:         slf4j-jdk14
+Requires:         jss = 5.4
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@@ -115,40 +112,38 @@ 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}
 
-%mvn_build
+./build.sh \
+    %{?_verbose:-v} \
+    --work-dir=%{_vpath_builddir} \
+    dist
 
 ################################################################################
 %install
 ################################################################################
 
-%mvn_install
+./build.sh \
-
+    %{?_verbose:-v} \
-ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
+    --work-dir=%{_vpath_builddir} \
-ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
+    --java-lib-dir=%{_javadir} \
-ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
+    --javadoc-dir=%{_javadocdir} \
-ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
+    --install-dir=%{buildroot} \
-ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
+    install
 
 ################################################################################
-%files -n %{product_id} -f .mfiles
+%files -n %{product_id}
 ################################################################################
 
+%{_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
@@ -156,28 +151,42 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 %{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
-%files -n %{product_id}-javadoc -f .mfiles-javadoc
+%files -n %{product_id}-javadoc
 ################################################################################
 
+%dir %{_javadocdir}/ldapjdk
+%{_javadocdir}/ldapjdk/*
+
 ################################################################################
 %changelog
-* Mon Dec 09 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-alpha1
+* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.0-1
-- Rebase to LDAP SDK 5.6.0-alpha1
+- 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
+
+* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1
+- Rebase to LDAP SDK 5.2.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
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-3.1
+* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
-- Bump release for October 2024 mass rebuild:
+- Rebase to LDAP SDK 5.2.0-beta1
-  Resolves: RHEL-64018
 
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.5.0-3
+* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
-- Rebuilt for MSVSphere 10
+- Rebase to LDAP SDK 5.0.0
 
-* Wed Aug 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 5.5.0-3
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
-- Rebuilt with java-21-openjdk as default JDK:
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  https://issues.redhat.com/browse/RHEL-34597
+  Related: rhbz#1991688
-- Resolves: RHEL-54333
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-2.1
+* Mon Aug  2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
-- Bump release for June 2024 mass rebuild
+- Drop javadoc package
 
-* Fri May 10 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-2
+* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
-- Rebase to LDAP SDK 5.5.0
+- Rebase to LDAP SDK 5.0.0-alpha1