diff --git a/.gitignore b/.gitignore index 8543605..819d6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ldap-sdk-4.21.0.tar.gz +SOURCES/ldap-sdk-4.22.0.tar.gz diff --git a/.ldapjdk.metadata b/.ldapjdk.metadata index e4555cb..92b06be 100644 --- a/.ldapjdk.metadata +++ b/.ldapjdk.metadata @@ -1 +1 @@ -41b058fce7ee5bc184f71e40bcf6cc169465072a SOURCES/ldap-sdk-4.21.0.tar.gz +4c38cc1c8b2ca32bd458c25ae0eaf847ace7fe93 SOURCES/ldap-sdk-4.22.0.tar.gz diff --git a/SPECS/ldapjdk.spec b/SPECS/ldapjdk.spec index 2618949..fc41e7e 100644 --- a/SPECS/ldapjdk.spec +++ b/SPECS/ldapjdk.spec @@ -8,8 +8,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.21.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Version: 4.22.0 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -71,6 +71,8 @@ Requires: jss >= 4.6.0 The Mozilla LDAP SDKs enable you to write applications which access, manage, and update the information stored in an LDAP directory. +%license docs/ldapjdk/license.txt + ################################################################################ %package javadoc ################################################################################ @@ -122,6 +124,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 popd mkdir -p %{buildroot}%{_mavenpomdir} +sed -i 's/@VERSION@/%{version}/g' %{name}.pom install -pm 644 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk" @@ -146,6 +149,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* Tue May 26 2020 Red Hat PKI Team 4.22.0-1 +- Rebased to LDAP SDK 4.22.0 + * Thu Oct 31 2019 Red Hat PKI Team 4.21.0-2 - Bump min required JSS version to 4.6.0