packages/tomcatjss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rectify the tomcatjss compilation failure

Browse Source
This commit is contained in:
wu-leilei 2022-11-21 14:41:44 +08:00
parent e274902b44
commit 30842af193
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tomcatjss.spec
View File

@ -4,7 +4,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+ License: LGPLv2+
BuildArch: noarch BuildArch: noarch
Version: 8.1.0 Version: 8.1.0
Release: 1 Release: 2
Source: https://github.com/dogtagpki/tomcatjss/archive/refs/tags/v8.1.0.tar.gz 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: ant apache-commons-lang3 java-latest-openjdk-devel slf4j
BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7 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 %autosetup -n tomcatjss-%{version} -p 1
%build %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} export JAVA_HOME=/usr/lib/jvm/${home_path}
./build.sh \ ./build.sh \
%{?_verbose:-v} \ %{?_verbose:-v} \
@ -31,7 +32,8 @@ export JAVA_HOME=/usr/lib/jvm/${home_path}
dist dist
%install %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} export JAVA_HOME=/usr/lib/jvm/${home_path}
./build.sh \ ./build.sh \
%{?_verbose:-v} \ %{?_verbose:-v} \
@ -48,6 +50,9 @@ export JAVA_HOME=/usr/lib/jvm/${home_path}
%{_javadir}/* %{_javadir}/*
%changelog %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 * Mon Oct 17 2022 wangkai <wangkai385@h-partners.com> - 8.1.0-1
- Upgrade to version 8.1.0 - Upgrade to version 8.1.0