diff --git a/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz b/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..360f3a82edd09a7f20ac98f878f2b1bdd6566009 Binary files /dev/null and b/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 455db0d50de55c79c818fcec344055d6aad4806a..4a92a09d4a182003f2423b16953bb974bc0b5c31 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -659,7 +659,7 @@ Requires: lksctp-tools%{?_isa} # 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 @@ -895,7 +895,6 @@ Patch92: 8295068-SSLEngine-throws-NPE-parsing-Certificate.patch ############################################ Patch2000: 2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch -BuildRequires: elfutils-extra BuildRequires: autoconf BuildRequires: alsa-lib-devel BuildRequires: binutils @@ -903,7 +902,6 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils # elfutils only are OK for build without AOT BuildRequires: elfutils-devel -BuildRequires: elfutils-extra BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: giflib-devel @@ -1538,12 +1536,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" @@ -1572,9 +1565,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}} @@ -1737,6 +1729,9 @@ cjc.mainProgram(arg) - modified 8231441-2-AArch64-Initial-SVE-backend-support.patch - delete 8290705_fix_StringConcat_validate_mem_flow_asserts_with_unexpected_userStoreI.patch +* Wed Dec 14 2022 DXwangg - 1:11.0.17.8-1 +- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires + * Wed Oct 19 2022 DXwangg - 1:11.0.17.8-0 - update to 11.0.17+8(GA) - modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch