From 2ea0add06726525946234d7f274fd77113a69420 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Wed, 20 Nov 2024 19:19:58 +0100 Subject: [PATCH 1/6] Rebase to LDAP-SDH 5.6.0-alpha1 --- .gitignore | 1 + ldapjdk.spec | 27 +++++++++++++++------------ sources | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 22372bc..73201cc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.4.1.tar.gz /ldap-sdk-5.5.0-alpha2.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 a5de2c8..d1448d6 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,32 +2,33 @@ Name: ldapjdk ################################################################################ -%global product_id dogtag-ldapjdk +%global vendor_id dogtag +%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 2 +%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,10 +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 +66,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 +81,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 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 +- Rebase to LDAP SDK 5.6.0-alpha1 + * Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 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 From 55e8171dc9294115f804e3265ceb9d7149ef69e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:18:12 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index d1448d6..8c3bb81 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ 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 Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 - Rebase to LDAP SDK 5.6.0-alpha1 From 01a264532c72a6e2dc2663ac5f17c7250889f87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:12:17 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 8c3bb81..88366a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ 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 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}.2 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6e4a0a8cf18ae2924029aee128caf45b4732eca Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:05:41 +0200 Subject: [PATCH 4/6] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- ldapjdk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 88366a8..775f084 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ 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 Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 # To create a tarball from a version tag: # $ git archive \ @@ -61,9 +61,9 @@ ExclusiveArch: %{java_arches} noarch # Build Dependencies ################################################################################ -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: %{java_devel} -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-jdk14) BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 +- Rebuilt for java-25-openjdk as preffered jdk + * Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 241a6a75becf3256b5271d739307347f556050ab Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 30 Jul 2025 19:02:15 -0400 Subject: [PATCH 5/6] Really rebuilt for java-25-openjdk as system jdk --- ldapjdk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 775f084..f986963 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ 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 Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.4 # To create a tarball from a version tag: # $ git archive \ @@ -54,9 +54,9 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%define java_devel java-21-openjdk-devel -%define java_headless java-21-openjdk-headless -%define java_home %{_jvmdir}/jre-21-openjdk +%define java_devel java-25-openjdk-devel +%define java_headless java-25-openjdk-headless +%define java_home %{_jvmdir}/jre-25-openjdk ################################################################################ # Build Dependencies ################################################################################ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 +- Really rebuilt for java-25-openjdk as system jdk + * Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 - Rebuilt for java-25-openjdk as preffered jdk From 79818842b6150fd85545ac6aac29856d4a27afc9 Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Wed, 5 Mar 2025 17:15:59 -0800 Subject: [PATCH 6/6] Rebase LDAP SDK to 5.6.0. --- .gitignore | 1 + ldapjdk.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 73201cc..dfa1e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.5.0-alpha2.tar.gz /ldap-sdk-5.5.0.tar.gz /ldap-sdk-5.6.0-alpha1.tar.gz +/ldap-sdk-5.6.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index f986963..eb973a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -13,13 +13,13 @@ Name: ldapjdk # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 0.1 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%global phase alpha1 +#global phase alpha1 %undefine timestamp %undefine commit_id @@ -28,7 +28,7 @@ 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 Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.4 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -57,13 +57,15 @@ ExclusiveArch: %{java_arches} noarch %define java_devel java-25-openjdk-devel %define java_headless java-25-openjdk-headless %define java_home %{_jvmdir}/jre-25-openjdk +%define maven_local maven-local-openjdk25 + ################################################################################ # Build Dependencies ################################################################################ BuildRequires: ant-openjdk25 BuildRequires: %{java_devel} -BuildRequires: maven-local-openjdk25 +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 @@ -160,6 +162,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 +- Rebase to LDAP SDK 5.6.0 + * Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 - Really rebuilt for java-25-openjdk as system jdk diff --git a/sources b/sources index d06af5a..fc04926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa +SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d