!9 [sync] PR-7: upgrade to version 5.1.0

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-18 01:21:03 +00:00 committed by Gitee
commit 9535981e2d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 24 additions and 18 deletions

Binary file not shown.

BIN
ldap-sdk-5.1.0.tar.gz Normal file

Binary file not shown.

View File

@ -3,11 +3,11 @@ Summary: LDAP SDK
URL: http://www.dogtagpki.org/ URL: http://www.dogtagpki.org/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
BuildArch: noarch BuildArch: noarch
Version: 4.22.0 Version: 5.1.0
Release: 5 Release: 1
Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz
BuildRequires: ant java-devel javapackages-local slf4j slf4j-jdk14 jss >= 4.6.0 BuildRequires: ant java-latest-openjdk-devel javapackages-local slf4j slf4j-jdk14 jss >= 5.1.0
Requires: jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 4.6.0 Requires: java-latest-openjdk-headless jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 5.1.0
%description %description
The Mozilla LDAP SDKs enable you to write applications which access, The Mozilla LDAP SDKs enable you to write applications which access,
@ -21,44 +21,50 @@ Javadoc for ldapjdk
%prep %prep
%autosetup -n ldap-sdk-%{version} -p 1 %autosetup -n ldap-sdk-%{version} -p 1
rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
%build %build
pwd home_path=`ls /usr/lib/jvm | grep java-18-openjdk-18`
( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 ) export JAVA_HOME=/usr/lib/jvm/${home_path}
ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
cd java-sdk ./build.sh \
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi %{?_verbose:-v} \
sh -x ant dist --work-dir=%{_vpath_builddir} \
dist
%install %install
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar install -m 644 %{_vpath_builddir}/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
install -m 644 java-sdk/dist/packages/ldapsp.jar $RPM_BUILD_ROOT%{_javadir}/ldapsp.jar install -m 644 %{_vpath_builddir}/packages/ldapsp.jar $RPM_BUILD_ROOT%{_javadir}/ldapsp.jar
install -m 644 java-sdk/dist/packages/ldapfilt.jar $RPM_BUILD_ROOT%{_javadir}/ldapfilt.jar install -m 644 %{_vpath_builddir}/packages/ldapfilt.jar $RPM_BUILD_ROOT%{_javadir}/ldapfilt.jar
install -m 644 java-sdk/dist/packages/ldapbeans.jar $RPM_BUILD_ROOT%{_javadir}/ldapbeans.jar install -m 644 %{_vpath_builddir}/packages/ldapbeans.jar $RPM_BUILD_ROOT%{_javadir}/ldapbeans.jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0
pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
ln -fs ../java/*ldapsp.jar jndi-ldap.jar ln -fs ../java/*ldapsp.jar jndi-ldap.jar
popd popd
mkdir -p %{buildroot}%{_mavenpomdir} mkdir -p %{buildroot}%{_mavenpomdir}
sed -i 's/@VERSION@/%{version}/g' ldapjdk.pom sed -i 's/4.22.1-SNAPSHOT/%{version}/g' pom.xml
install -pm 644 ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
%add_maven_depmap JPP-ldapjdk.pom ldapjdk.jar -a "ldapsdk:ldapsdk" %add_maven_depmap JPP-ldapjdk.pom ldapjdk.jar -a "ldapsdk:ldapsdk"
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk cp -r %{_vpath_builddir}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
%files -f .mfiles %files -f .mfiles
%{_javadir}/ldapjdk.jar
%{_javadir}/ldapsp*.jar %{_javadir}/ldapsp*.jar
%{_javadir}/ldapfilt*.jar %{_javadir}/ldapfilt*.jar
%{_javadir}/ldapbeans*.jar %{_javadir}/ldapbeans*.jar
%{_javadir}-1.3.0/*.jar %{_javadir}-1.3.0/*.jar
%{_mavenpomdir}/JPP-ldapjdk.pom
%files javadoc %files javadoc
%dir %{_javadocdir}/ldapjdk %dir %{_javadocdir}/ldapjdk
%{_javadocdir}/ldapjdk/* %{_javadocdir}/ldapjdk/*
%changelog %changelog
* Thu Jun 2 2022 Ge Wang <wangge20@h-partners.com> - 5.1.0-1
- DESC: upgrade versoin to 5.1.0
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.22.0-5 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.22.0-5
- DESC: delete -S git from %autosetup, and delete BuildRequires git - DESC: delete -S git from %autosetup, and delete BuildRequires git