From 15b7d544f24b74b414cbfffad2127d25f066bea5 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 20 Dec 2024 13:34:50 +0300 Subject: [PATCH] import ldapjdk-5.6.0-0.1.alpha1.el10 --- .gitignore | 2 +- .ldapjdk.metadata | 2 +- SPECS/ldapjdk.spec | 26 +++++++++++++++----------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e72cee8..06c0521 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ldap-sdk-5.5.0.tar.gz +SOURCES/ldap-sdk-5.6.0-alpha1.tar.gz diff --git a/.ldapjdk.metadata b/.ldapjdk.metadata index 735f62a..00b9a74 100644 --- a/.ldapjdk.metadata +++ b/.ldapjdk.metadata @@ -1 +1 @@ -e768bb087a0f72e81b17d90eb1a37fb900fabf6e SOURCES/ldap-sdk-5.5.0.tar.gz +7ccd2e41aba7f9aee665a67f1c6a79d745393ac7 SOURCES/ldap-sdk-5.6.0-alpha1.tar.gz diff --git a/SPECS/ldapjdk.spec b/SPECS/ldapjdk.spec index aea51b1..388c125 100644 --- a/SPECS/ldapjdk.spec +++ b/SPECS/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