packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I64NFZ:Merge branch 'master' into openEuler-20.03-LTS-SP3

Browse Source
This commit is contained in:
DXwangg 2022-12-07 17:04:17 +08:00
parent cd80175ef5
commit 881b56f45e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openjdk-11.spec
View File

@ -651,7 +651,7 @@ Requires: lksctp-tools%{?_isa}
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # 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 # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
# considered as regression # considered as regression
Requires: copy-jdk-configs >= 3.3 Requires: copy-jdk-configs >= 3.9
OrderWithRequires: copy-jdk-configs OrderWithRequires: copy-jdk-configs
# for printing support # for printing support
Requires: cups-libs Requires: cups-libs
@ -1514,7 +1514,13 @@ done
-- whether copy-jdk-configs is installed or not. If so, then configs are copied -- whether copy-jdk-configs is installed or not. If so, then configs are copied
-- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
local posix = require "posix" local posix = require "posix"
local debug = false
if (os.getenv("debug") == "true") then
debug = true;
print("cjc: in spec debug is on")
else
debug = false;
end
SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
@ -1543,8 +1549,9 @@ else
end end
end end
-- run content of included file with fake args -- 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}"} arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
require "copy_jdk_configs.lua" cjc.mainProgram(arg)
%post %post
%{post_script %{nil}} %{post_script %{nil}}
@ -1695,9 +1702,6 @@ require "copy_jdk_configs.lua"
- delete fix_X509TrustManagerImpl_symantec_distrust.patch - delete fix_X509TrustManagerImpl_symantec_distrust.patch
- add fix_Internal_and_external_code_inconsistency.patch - add fix_Internal_and_external_code_inconsistency.patch
* Tue May 31 2022 noah <hedongbo@huawei.com> - 1:11.0.15.10-2
- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires
* Thu Apr 28 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.15.10-1 * Thu Apr 28 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.15.10-1
- add fix_X509TrustManagerImpl_symantec_distrust.patch - add fix_X509TrustManagerImpl_symantec_distrust.patch