diff --git a/.gitignore b/.gitignore index c76ce60..409acf8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.4.1.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 diff --git a/ldapjdk.spec b/ldapjdk.spec index 9329669..80e759d 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,32 +2,33 @@ Name: ldapjdk ################################################################################ -%global product_id idm-ldapjdk +%global vendor_id idm +%global product_id %{vendor_id}-ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 5 +%global minor_version 6 %global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 3 +%global release_number 0.1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -#global phase +%global phase alpha1 %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}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -53,9 +54,9 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%define java_devel java-devel -%define java_headless java-headless -%define java_home %{_jvmdir}/jre-openjdk +%define java_devel java-21-openjdk-devel +%define java_headless java-21-openjdk-headless +%define java_home %{_jvmdir}/jre-21-openjdk ################################################################################ # Build Dependencies @@ -66,7 +67,7 @@ BuildRequires: %{java_devel} BuildRequires: maven-local BuildRequires: mvn(org.slf4j:slf4j-api) 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 The Mozilla LDAP SDKs enable you to write applications which access, @@ -81,7 +82,7 @@ Summary: LDAP SDK Requires: %{java_headless} Requires: mvn(org.slf4j:slf4j-api) 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} Provides: ldapjdk = %{version}-%{release} @@ -160,6 +161,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Mon Dec 09 2024 Red Hat PKI Team - 5.6.0-alpha1 +- Rebase to LDAP SDK 5.6.0-alpha1 + * Tue Oct 29 2024 Troy Dawson - 5.5.0-3.1 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index 77779dc..d06af5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59 +SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa