From 7aafb6b9ac88f504412ad59d6e0bc0dff700d801 Mon Sep 17 00:00:00 2001 From: cherry530 Date: Tue, 22 Nov 2022 15:39:15 +0800 Subject: [PATCH] Optimize to get the path of JAVA_HOME Signed-off-by: cherry530 (cherry picked from commit 38aa8f7adf948fcbfa777b9d57ffe496fd90141e) --- ldapjdk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index c34d3b1..e1f001a 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ URL: http://www.dogtagpki.org/ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 5.1.0 -Release: 2 +Release: 3 Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz BuildRequires: ant java-latest-openjdk-devel javapackages-local slf4j slf4j-jdk14 jss >= 5.1.0 Requires: java-latest-openjdk-headless jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 5.1.0 @@ -23,7 +23,8 @@ Javadoc for ldapjdk %autosetup -n ldap-sdk-%{version} -p 1 %build -home_path=`ls /usr/lib/jvm | grep java-19-openjdk-19` +openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16` +home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}` export JAVA_HOME=/usr/lib/jvm/${home_path} ./build.sh \ @@ -62,6 +63,9 @@ cp -r %{_vpath_builddir}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk %{_javadocdir}/ldapjdk/* %changelog +* Tue Nov 22 2022 xu_ping - 5.1.0-3 +- DESC: Optimize to get the path of JAVA_HOME + * Sat Nov 19 2022 xu_ping - 5.1.0-2 - DESC: Modify java version to fix get java_home error -- Gitee