!19 Update to 5.4.1

From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

ldapjdk.spec

@@ -3,11 +3,11 @@ Summary:             LDAP SDK
 URL:                 http://www.dogtagpki.org/
 License:             MPLv1.1 or GPLv2+ or LGPLv2+
 BuildArch:           noarch
-Version:             4.22.0
+Version:             5.4.1
-Release:             3
+Release:             1
 Source:              https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz
-BuildRequires:       git 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 slf4 slf4j-jdk14 jss >= 4.6.0
+Requires:            java-latest-openjdk-headless jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 5.1.0
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -20,44 +20,64 @@ Summary:             Javadoc for ldapjdk
 Javadoc for ldapjdk
 
 %prep
-%autosetup -n ldap-sdk-%{version} -p 1 -S git
+%autosetup -n ldap-sdk-%{version} -p 1
-rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
 
 %build
-pwd
+openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
-( cd  java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 )
+home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}`
-ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
+export JAVA_HOME=/usr/lib/jvm/${home_path}
-cd java-sdk
+
-if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
+./build.sh \
-sh -x ant dist
+    %{?_verbose:-v} \
+    --work-dir=%{_vpath_builddir} \
+    dist
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+./build.sh \
-install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
+    %{?_verbose:-v} \
-install -m 644 java-sdk/dist/packages/ldapsp.jar $RPM_BUILD_ROOT%{_javadir}/ldapsp.jar
+    --work-dir=%{_vpath_builddir} \
-install -m 644 java-sdk/dist/packages/ldapfilt.jar $RPM_BUILD_ROOT%{_javadir}/ldapfilt.jar
+    --java-lib-dir=%{_javadir} \
-install -m 644 java-sdk/dist/packages/ldapbeans.jar $RPM_BUILD_ROOT%{_javadir}/ldapbeans.jar
+    --javadoc-dir=%{_javadocdir} \
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0
+    --install-dir=%{buildroot} \
-pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
+    install
-	ln -fs ../java/*ldapsp.jar jndi-ldap.jar
+
-popd
 mkdir -p %{buildroot}%{_mavenpomdir}
-sed -i 's/@VERSION@/%{version}/g' ldapjdk.pom
+sed -i 's/5.4.0-SNAPSHOT/%{version}/g' pom.xml
-install -pm 644 ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
+sed -i 's/${revision}/%{version}/g' pom.xml
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
 %add_maven_depmap JPP-ldapjdk.pom ldapjdk.jar -a "ldapsdk:ldapsdk"
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
-cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
 
 %files -f .mfiles
-%{_javadir}/ldapsp*.jar
+%{_javadir}/ldapjdk.jar
-%{_javadir}/ldapfilt*.jar
+%{_javadir}/ldapsp.jar
-%{_javadir}/ldapbeans*.jar
+%{_javadir}/ldapfilt.jar
-%{_javadir}-1.3.0/*.jar
+%{_javadir}/ldapbeans.jar
+%{_javadir}/ldaptools.jar
+%{_mavenpomdir}/JPP-ldapjdk.pom
+%{_mavenpomdir}/JPP-ldapsp.pom
+%{_mavenpomdir}/JPP-ldapfilter.pom
+%{_mavenpomdir}/JPP-ldapbeans.pom
+%{_mavenpomdir}/JPP-ldaptools.pom
 
 %files javadoc
 %dir %{_javadocdir}/ldapjdk
 %{_javadocdir}/ldapjdk/*
 
 %changelog
-* Thu Jul 16 2020 yaokai <yaoaki13@huawei.com> - 4.22.0-3
+* Fri Sep 15 2023 chenchen <chen_aka_jan@163.com> - 5.4.1-1
+- Upgrade to version 5.4.1
+
+* Wed Jan 18 2023 xu_ping <xuping33@h-partners.com> - 5.1.0-2
+- DESC: fix get java_home error
+
+* 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
+- DESC: delete -S git from %autosetup, and delete BuildRequires git
+
+* Thu Jul 23 2020 yaokai <yaokai13@huawei.com> - 4.22.0-4
+- Fix the wrong requires
+
+* Thu Jul 16 2020 yaokai <yaokai13@huawei.com> - 4.22.0-3
 - package init