diff --git a/.gitignore b/.gitignore index dfa1e6e..22372bc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,3 @@ 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 -/ldap-sdk-5.6.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index eb973a8..6cbaed7 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,31 +2,30 @@ Name: ldapjdk ################################################################################ -%global vendor_id dogtag -%global product_id %{vendor_id}-ldapjdk +%global product_id dogtag-ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 6 +%global minor_version 5 %global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 1 +%global release_number 2 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -#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,21 +53,20 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%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 +%define java_devel java-devel +%define java_headless java-headless +%define java_home %{_jvmdir}/jre-openjdk ################################################################################ # Build Dependencies ################################################################################ -BuildRequires: ant-openjdk25 +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 +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -83,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.6.0 +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 Obsoletes: ldapjdk < %{version}-%{release} Provides: ldapjdk = %{version}-%{release} @@ -162,31 +160,10 @@ 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 - -* 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 - -* 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 - -* Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 - Really rebuilt for java-21-openjdk as system jdk -* Tue Feb 27 2024 Jiri Vanek - 5.5.0-1.1 +* Sat Mar 02 2024 Jiri Vanek - 5.5.0-1.1 - Rebuilt for java-21-openjdk as system jdk * Wed Feb 21 2024 Dogtag PKI Team 5.5.0-1 diff --git a/sources b/sources index fc04926..77779dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d +SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59