From 847539881c4f5f3ac6ade15e3d6cbbdb91b18e3b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 19:43:15 +0000 Subject: import ldapjdk-4.21.0-1.module+el8.1.0+3370+6d076660 --- diff --git a/.gitignore b/.gitignore index 3ac1cb1..8543605 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ldap-sdk-4.20.0.tar.gz +SOURCES/ldap-sdk-4.21.0.tar.gz diff --git a/.ldapjdk.metadata b/.ldapjdk.metadata index b46b5f6..e4555cb 100644 --- a/.ldapjdk.metadata +++ b/.ldapjdk.metadata @@ -1 +1 @@ -a6666cc8d9e5e7621f985a75e44313fa97dc2981 SOURCES/ldap-sdk-4.20.0.tar.gz +41b058fce7ee5bc184f71e40bcf6cc169465072a SOURCES/ldap-sdk-4.21.0.tar.gz diff --git a/SPECS/ldapjdk.spec b/SPECS/ldapjdk.spec index 4da094c..55d568d 100644 --- a/SPECS/ldapjdk.spec +++ b/SPECS/ldapjdk.spec @@ -8,7 +8,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.20.0 +Version: 4.21.0 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 @@ -45,6 +45,12 @@ 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.5.0-1 ################################################################################ @@ -52,6 +58,12 @@ BuildRequires: jss >= 4.5.0-1 ################################################################################ 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.5.0-1 @@ -134,6 +146,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* Mon Jun 10 2019 Dogtag PKI Team 4.21.0-0 +- Rebased to LDAP SDK 4.21.0 + * Fri Aug 10 2018 Dogtag PKI Team 4.20.0-0 - Rebased to LDAP SDK 4.20.0