Rebase to match upstream version 4.22.0

Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
This commit is contained in:
Dinesh Prasanth M K 2020-06-10 17:00:52 -04:00
parent 89f64f2d5d
commit fba596672b
No known key found for this signature in database
GPG Key ID: 0D4491AB07D86AB0
3 changed files with 20 additions and 3 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ ldapjdk-4.18.tar.gz
/ldapjdk-4.19.tar.gz /ldapjdk-4.19.tar.gz
/ldap-sdk-4.20.0.tar.gz /ldap-sdk-4.20.0.tar.gz
/ldap-sdk-4.21.0.tar.gz /ldap-sdk-4.21.0.tar.gz
/ldap-sdk-4.22.0.tar.gz

View File

@ -8,8 +8,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
BuildArch: noarch BuildArch: noarch
Version: 4.21.0 Version: 4.22.0
Release: 3%{?_timestamp}%{?_commit_id}%{?dist} Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1 # global _phase -a1
%global spname ldapsp %global spname ldapsp
@ -46,6 +46,11 @@ BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: javapackages-local BuildRequires: javapackages-local
%endif %endif
BuildRequires: slf4j BuildRequires: slf4j
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
BuildRequires: slf4j-jdk14
%endif
BuildRequires: jss >= 4.6.0 BuildRequires: jss >= 4.6.0
################################################################################ ################################################################################
@ -54,6 +59,11 @@ BuildRequires: jss >= 4.6.0
Requires: jpackage-utils >= 0:1.5 Requires: jpackage-utils >= 0:1.5
Requires: slf4j Requires: slf4j
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
Requires: slf4j-jdk14
%endif
Requires: jss >= 4.6.0 Requires: jss >= 4.6.0
@ -61,6 +71,8 @@ Requires: jss >= 4.6.0
The Mozilla LDAP SDKs enable you to write applications which access, The Mozilla LDAP SDKs enable you to write applications which access,
manage, and update the information stored in an LDAP directory. manage, and update the information stored in an LDAP directory.
%license docs/ldapjdk/license.txt
################################################################################ ################################################################################
%package javadoc %package javadoc
################################################################################ ################################################################################
@ -112,6 +124,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
popd popd
mkdir -p %{buildroot}%{_mavenpomdir} mkdir -p %{buildroot}%{_mavenpomdir}
sed -i 's/@VERSION@/%{version}/g' %{name}.pom
install -pm 644 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -pm 644 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk" %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk"
@ -136,6 +149,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
################################################################################ ################################################################################
%changelog %changelog
* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.22.0-1
- Rebase to match latest upstream version: 4.22.0
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.21.0-3 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.21.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (ldap-sdk-4.21.0.tar.gz) = c1a01c179d5f2f7635327124439089b68c387e9f93038072feff719624f913fa0efbfa6bad71f9229bc3314e732b020e007cc60d942fed06a2a6bf1ea40d5f7b SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be