Rebase to LDAP SDK 5.6.0-alpha1

Resolves: RHEL-34872
This commit is contained in:
Marco Fargetta 2024-12-04 12:30:39 +01:00
parent cbd007e9be
commit 2cda28bc4e
3 changed files with 24 additions and 7 deletions

1
.gitignore vendored
View File

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

View File

@ -2,23 +2,24 @@
Name: ldapjdk Name: ldapjdk
################################################################################ ################################################################################
%global product_id idm-ldapjdk %global vendor_id idm
%global product_id %{vendor_id}-ldapjdk
# Upstream version number: # Upstream version number:
%global major_version 5 %global major_version 5
%global minor_version 5 %global minor_version 6
%global update_version 0 %global update_version 0
# Downstream release number: # Downstream release number:
# - development/stabilization (unsupported): 0.<n> where n >= 1 # - development/stabilization (unsupported): 0.<n> where n >= 1
# - GA/update (supported): <n> where n >= 1 # - GA/update (supported): <n> where n >= 1
%global release_number 1 %global release_number 0.1
# Development phase: # Development phase:
# - development (unsupported): alpha<n> where n >= 1 # - development (unsupported): alpha<n> where n >= 1
# - stabilization (unsupported): beta<n> where n >= 1 # - stabilization (unsupported): beta<n> where n >= 1
# - GA/update (supported): <none> # - GA/update (supported): <none>
#global phase %global phase alpha1
%undefine timestamp %undefine timestamp
%undefine commit_id %undefine commit_id
@ -53,10 +54,22 @@ ExclusiveArch: %{java_arches} noarch
# Java # Java
################################################################################ ################################################################################
%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_devel java-17-openjdk-devel
%define java_headless java-17-openjdk-headless %define java_headless java-17-openjdk-headless
%define java_home %{_jvmdir}/jre-17-openjdk %define java_home %{_jvmdir}/jre-17-openjdk
%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
%endif
################################################################################ ################################################################################
# Build Dependencies # Build Dependencies
################################################################################ ################################################################################
@ -66,7 +79,7 @@ BuildRequires: %{java_devel}
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14) BuildRequires: mvn(org.slf4j:slf4j-jdk14)
BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
%description %description
The Mozilla LDAP SDKs enable you to write applications which access, The Mozilla LDAP SDKs enable you to write applications which access,
@ -81,7 +94,7 @@ Summary: LDAP SDK
Requires: %{java_headless} Requires: %{java_headless}
Requires: mvn(org.slf4j:slf4j-api) Requires: mvn(org.slf4j:slf4j-api)
Requires: mvn(org.slf4j:slf4j-jdk14) Requires: mvn(org.slf4j:slf4j-jdk14)
Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
Obsoletes: ldapjdk < %{version}-%{release} Obsoletes: ldapjdk < %{version}-%{release}
Provides: ldapjdk = %{version}-%{release} Provides: ldapjdk = %{version}-%{release}
@ -160,6 +173,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
################################################################################ ################################################################################
%changelog %changelog
* Wed Dec 04 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-alpha1
- Rebase to LDAP SDK 5.6.0-alpha1
* Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-1 * Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-1
- Rebase to LDAP SDK 5.5.0 - Rebase to LDAP SDK 5.5.0

View File

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