!16 修复openjdk-latest升级导致tomcatjss编译失败
From: @wu-leilei Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
2bb4ba385e
@ -4,7 +4,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
|
||||
License: LGPLv2+
|
||||
BuildArch: noarch
|
||||
Version: 8.1.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Source: https://github.com/dogtagpki/tomcatjss/archive/refs/tags/v8.1.0.tar.gz
|
||||
BuildRequires: ant apache-commons-lang3 java-latest-openjdk-devel slf4j
|
||||
BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7
|
||||
@ -21,7 +21,8 @@ Apache Tomcat of JSS Connector.
|
||||
%autosetup -n tomcatjss-%{version} -p 1
|
||||
|
||||
%build
|
||||
home_path=`ls /usr/lib/jvm | grep java-18-openjdk-18`
|
||||
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 \
|
||||
%{?_verbose:-v} \
|
||||
@ -31,7 +32,8 @@ export JAVA_HOME=/usr/lib/jvm/${home_path}
|
||||
dist
|
||||
|
||||
%install
|
||||
home_path=`ls /usr/lib/jvm | grep java-18-openjdk-18`
|
||||
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 \
|
||||
%{?_verbose:-v} \
|
||||
@ -48,6 +50,9 @@ export JAVA_HOME=/usr/lib/jvm/${home_path}
|
||||
%{_javadir}/*
|
||||
|
||||
%changelog
|
||||
* Mon Nov 21 2022 wulei <wulei80@h-partners.com> - 8.1.0-2
|
||||
- Rectify the tomcatjss compilation failure caused by the openjdk-latest upgrade
|
||||
|
||||
* Mon Oct 17 2022 wangkai <wangkai385@h-partners.com> - 8.1.0-1
|
||||
- Upgrade to version 8.1.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user