From 75ca0596a283e17ede7df0ee57dcb16508cea84f Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 30 Nov 2022 13:16:54 +0700 Subject: [PATCH] Rebase to LDAP SDK 5.3.0-beta1 Resolves: #2149488 --- .gitignore | 1 + ldapjdk.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4ce7168..3688dee 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.2.0-beta1.tar.gz /ldap-sdk-5.2.0-beta2.tar.gz /ldap-sdk-5.2.0.tar.gz +/ldap-sdk-5.3.0-beta1.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index c197b79..441de03 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -6,19 +6,19 @@ Name: ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 2 +%global minor_version 3 %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 0.2 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%undefine phase +%global phase beta1 %undefine timestamp %undefine commit_id @@ -62,7 +62,7 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss >= 5.2.0 +BuildRequires: jss = 5.3 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -78,10 +78,12 @@ Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss >= 5.2.0 +Requires: jss = 5.3 Obsoletes: ldapjdk < %{version}-%{release} Provides: ldapjdk = %{version}-%{release} +Provides: ldapjdk = %{major_version}.%{minor_version} +Provides: %{product_id} = %{major_version}.%{minor_version} %description -n %{product_id} The Mozilla LDAP SDKs enable you to write applications which access, @@ -97,6 +99,8 @@ Summary: Javadoc for LDAP SDK Obsoletes: ldapjdk-javadoc < %{version}-%{release} Provides: ldapjdk-javadoc = %{version}-%{release} +Provides: ldapjdk-javadoc = %{major_version}.%{minor_version} +Provides: %{product_id}-javadoc = %{major_version}.%{minor_version} %description -n %{product_id}-javadoc Javadoc for LDAP SDK @@ -138,10 +142,12 @@ export JAVA_HOME=%{java_home} %{_javadir}/ldapsp.jar %{_javadir}/ldapfilt.jar %{_javadir}/ldapbeans.jar +%{_javadir}/ldaptools.jar %{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapfilter.pom %{_mavenpomdir}/JPP-ldapbeans.pom +%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %files -n %{product_id}-javadoc @@ -152,6 +158,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Wed Nov 30 2022 Red Hat PKI Team - 5.3.0-0.2.beta1 +- Rebase to LDAP SDK 5.3.0-beta1 + * Thu Jun 30 2022 Red Hat PKI Team - 5.2.0-1 - Rebase to LDAP SDK 5.2.0 diff --git a/sources b/sources index 28b54ff..9dd5e96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.2.0.tar.gz) = 8799375fac34d2099601827b08c06f14a40f41f4b119bffab9e052cfa16d1b4b9758e231bac220c617ca4e07a32106f21308615a63a23bb66e0f55a1d992c3bb +SHA512 (ldap-sdk-5.3.0-beta1.tar.gz) = 09ce32585474f1ee2bc0c66391b6dc0639b7faf843c7f02c37cfadc4528aa6398c6034923c0cdb2f4db9aaab70a3ec608ed1e8037c8221dca31da8e749ba3e39