I65G6C:【统一构建openEuler-20.03-LTS-SP3】java-1.8.0-openjdk-headless 安装报错
This commit is contained in:
parent
89585be53d
commit
20e9e456a6
@ -820,7 +820,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION}
|
||||
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
|
||||
# not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
|
||||
# considered as regression
|
||||
Requires: copy-jdk-configs >= 3.9
|
||||
Requires: copy-jdk-configs >= 3.3
|
||||
OrderWithRequires: copy-jdk-configs
|
||||
# for printing support
|
||||
Requires: cups-libs
|
||||
@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}.%{buildver}
|
||||
Release: 4
|
||||
Release: 5
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
@ -2096,12 +2096,7 @@ done
|
||||
-- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
|
||||
local posix = require "posix"
|
||||
|
||||
if (os.getenv("debug") == "true") then
|
||||
debug = true;
|
||||
print("cjc: in spec debug is on")
|
||||
else
|
||||
debug = false;
|
||||
end
|
||||
local debug = false
|
||||
|
||||
SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
|
||||
SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
|
||||
@ -2130,9 +2125,8 @@ else
|
||||
end
|
||||
end
|
||||
-- run content of included file with fake args
|
||||
cjc = require "copy_jdk_configs.lua"
|
||||
arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
|
||||
cjc.mainProgram(arg)
|
||||
require "copy_jdk_configs.lua"
|
||||
|
||||
%post
|
||||
%{post_script %{nil}}
|
||||
@ -2269,6 +2263,9 @@ cjc.mainProgram(arg)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Dec 14 2022 DXwangg<wangjiawei80@huawei.com> - 1:1.8.0.352-b08.5
|
||||
- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires
|
||||
|
||||
* Tue Oct 25 2022 kuenking111<wangkun49@huawei.com> - 1:1.8.0.352-b08.4
|
||||
- add Huawei-fix-windows-build-Dynamic-CDS-failure.patch
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user