Rebase to LDAP SDK 5.6.0

Resolves: RHEL-34872
This commit is contained in:
Endi S. Dewata 2025-02-13 19:20:12 +00:00
parent 5f18bfe365
commit be13b40fca
3 changed files with 17 additions and 7 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ ldapjdk-4.18.tar.gz
/ldap-sdk-5.5.0-alpha4.tar.gz
/ldap-sdk-5.5.0.tar.gz
/ldap-sdk-5.6.0-alpha1.tar.gz
/ldap-sdk-5.6.0.tar.gz

View File

@ -2,6 +2,7 @@
Name: ldapjdk
################################################################################
# Note: This is required for IdM. Don't remove or merge upstream.
%global vendor_id idm
%global product_id %{vendor_id}-ldapjdk
@ -13,20 +14,20 @@ Name: ldapjdk
# Downstream release number:
# - development/stabilization (unsupported): 0.<n> where n >= 1
# - GA/update (supported): <n> where n >= 1
%global release_number 0.2
%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: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later
Version: %{major_version}.%{minor_version}.%{update_version}
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
@ -54,19 +55,24 @@ ExclusiveArch: %{java_arches} noarch
# Java
################################################################################
# use Java 17 on Fedora 39 or older and RHEL 9 or older
# otherwise, use Java 21
# maven-local is a subpackage of javapackages-tools
%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
# use Java 17 on Fedora 39 or older and RHEL 9 or older
%define java_devel java-17-openjdk-devel
%define java_headless java-17-openjdk-headless
%define java_home %{_jvmdir}/jre-17-openjdk
%define maven_local maven-local-openjdk17
%else
# otherwise, use Java 21
%define java_devel java-21-openjdk-devel
%define java_headless java-21-openjdk-headless
%define java_home %{_jvmdir}/jre-21-openjdk
%define maven_local maven-local
%endif
@ -76,7 +82,7 @@ ExclusiveArch: %{java_arches} noarch
BuildRequires: ant
BuildRequires: %{java_devel}
BuildRequires: maven-local
BuildRequires: %{maven_local}
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
@ -173,6 +179,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
################################################################################
%changelog
* Thu Feb 13 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-1
- Rebase to LDAP SDK 5.6.0
* Wed Dec 04 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-alpha1
- Rebase to LDAP SDK 5.6.0-alpha1

View File

@ -1 +1 @@
SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa
SHA512 (ldap-sdk-5.6.0.tar.gz) = 85f3f3f8c1410f3c7fe58605c5f15a6cd97357399891839fc5a59731dd0584147d271e5c749e09416283b7349031fe873c700dfe16879b0d9bdf0f8db500b4e8