From a952d93e6bdf8b0914d10dadfa639b428070213e Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 22 Jun 2021 15:16:24 -0500 Subject: [PATCH] Rebase to LDAP SDK 5.0.0-alpha1 --- .gitignore | 1 + ldapjdk.spec | 61 ++++++---------------------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index a3d5a50..b4bcc4c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-4.21.0.tar.gz /ldap-sdk-4.22.0.tar.gz /ldap-sdk-4.23.0-alpha1.tar.gz +/ldap-sdk-5.0.0-alpha1.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 67c0b57..c0bb611 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -10,7 +10,7 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 4.23.0 +Version: 5.0.0 Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} %global _phase -alpha1 @@ -39,7 +39,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap %define java_devel java-11-openjdk-devel %define java_headless java-11-openjdk-headless -%define java_home /usr/lib/jvm/jre-11-openjdk +%define java_home /usr/lib/jvm/java-11-openjdk ################################################################################ # Build Dependencies @@ -47,18 +47,10 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap BuildRequires: ant BuildRequires: %{java_devel} -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: jpackage-utils >= 0:1.5 -%else BuildRequires: javapackages-local -%endif BuildRequires: slf4j -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no slf4j-jdk14 -%else BuildRequires: slf4j-jdk14 -%endif -BuildRequires: jss >= 4.6.0 +BuildRequires: jss >= 5.0.0 ################################################################################ # Runtime Dependencies @@ -67,13 +59,8 @@ BuildRequires: jss >= 4.6.0 Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no slf4j-jdk14 -%else Requires: slf4j-jdk14 -%endif -Requires: jss >= 4.6.0 - +Requires: jss >= 5.0.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -104,7 +91,7 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar ################################################################################ pushd java-sdk/ldapjdk/lib -build-jar-repository -s -p . jss4 +build-jar-repository -s -p . jss popd ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib @@ -155,39 +142,5 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog -* Mon Jun 07 2021 Dogtag PKI Team - 4.23.0-0.1 -- Rebase to LDAP SDK 4.23.0-alpha1 - -* Tue Jan 26 2021 Fedora Release Engineering - 4.22.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 17 2020 Dogtag PKI Team - 4.22.0-4 -- Rebuilt for JDK8 compatibility - -* Tue Jul 28 2020 Fedora Release Engineering - 4.22.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 4.22.0-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 10 2020 Dogtag PKI Team - 4.22.0-1 -- Rebase to match latest upstream version: 4.22.0 - -* Wed Jan 29 2020 Fedora Release Engineering - 4.21.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-2 -- Bump min required JSS version to 4.6.0 - -* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-1 -- Rebased to LDAP SDK 4.21.0 - -* Thu Jul 25 2019 Fedora Release Engineering - 4.20.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 4.20.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-1 -- Rebased to LDAP SDK 4.20.0 - +* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1 +- Rebase to LDAP SDK 5.0.0-alpha1 diff --git a/sources b/sources index afccbb6..be47f3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.23.0-alpha1.tar.gz) = 07146fda16dea7c84ed5f66bf3566120a037a3a4ab80a37030429a66d22b8e42d058b67d04f3a6c7efe9a76d1fd2b3ad62cf270684f8626dcfc996778a1cdbbe +SHA512 (ldap-sdk-5.0.0-alpha1.tar.gz) = dcb1f0da5f7aaaa76151a2c9fc687dbdfec382919177fe38a78f58a1bfcbe9033a5f087755653883cbdfabc762a6ce7d008df3dc4c14854036f3087f7e2568a7