!26 [sync] PR-25: 修复openjdk-latest升级导致pki-core编译失败
From: @openeuler-sync-bot Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
d5157fbd55
@ -1,13 +1,9 @@
|
|||||||
%define package_option() %bcond_with %1
|
%define package_option() %bcond_with %1
|
||||||
%define _unpackaged_files_terminate_build 0
|
%define _unpackaged_files_terminate_build 0
|
||||||
|
|
||||||
%define java_devel java-18-openjdk-devel
|
|
||||||
%define java_headless java-18-openjdk-headless
|
|
||||||
%define java_home /usr/lib/jvm/jre-18-openjdk
|
|
||||||
|
|
||||||
Name: pki-core
|
Name: pki-core
|
||||||
Version: 11.0.0
|
Version: 11.0.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: The PKI Core Package
|
Summary: The PKI Core Package
|
||||||
License: GPLv2 and LGPLv2
|
License: GPLv2 and LGPLv2
|
||||||
URL: http://www.dogtagpki.org/
|
URL: http://www.dogtagpki.org/
|
||||||
@ -207,6 +203,9 @@ The PKI console is a Java application used to manage the PKI server.
|
|||||||
tar -xf %{SOURCE1}
|
tar -xf %{SOURCE1}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
|
||||||
|
java_home=/usr/lib/jvm/jre-${openjdk_latest_version}-openjdk
|
||||||
|
|
||||||
tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
|
tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
|
||||||
if [ $tomcat_version == "9.0" ]; then
|
if [ $tomcat_version == "9.0" ]; then
|
||||||
app_server=tomcat-9.0
|
app_server=tomcat-9.0
|
||||||
@ -223,7 +222,7 @@ cd build
|
|||||||
|
|
||||||
%cmake \
|
%cmake \
|
||||||
--no-warn-unused-cli -DVERSION=%{version}-%{release} \
|
--no-warn-unused-cli -DVERSION=%{version}-%{release} \
|
||||||
-DVAR_INSTALL_DIR:PATH=/var -DJAVA_HOME=%{java_home} \
|
-DVAR_INSTALL_DIR:PATH=/var -DJAVA_HOME=${java_home} \
|
||||||
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
|
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
|
||||||
-DAPP_SERVER=$app_server \
|
-DAPP_SERVER=$app_server \
|
||||||
-DJAXRS_API_JAR=/usr/share/java/jboss-jaxrs-2.0-api.jar \
|
-DJAXRS_API_JAR=/usr/share/java/jboss-jaxrs-2.0-api.jar \
|
||||||
@ -453,6 +452,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 23 2022 wulei <wulei80@h-partners.com> - 11.0.0-3
|
||||||
|
- Rectify the pki-core compilation failure caused by the openjdk-latest upgrade
|
||||||
|
|
||||||
* Wed Aug 24 2022 wangkai <wangkai385@h-partners.com> - 11.0.0-2
|
* Wed Aug 24 2022 wangkai <wangkai385@h-partners.com> - 11.0.0-2
|
||||||
- Remove rpath and enable debuginfo
|
- Remove rpath and enable debuginfo
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user