From cf7b5892e874a1a1fe07481a8f2cf37af5f0c600 Mon Sep 17 00:00:00 2001 From: douyiwang Date: Wed, 17 Dec 2025 17:39:49 +0800 Subject: [PATCH] RISC-V: Isolate some patches from riscv64 (cherry picked from commit 0718b1626ccda64b5a07bcaa12d4db86418541d5) --- openjdk-21.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openjdk-21.spec b/openjdk-21.spec index 29d2775..7886e35 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -905,7 +905,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 7 +Release: 8 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -1369,6 +1369,12 @@ pushd %{top_level_dir_name} %patch94 -p1 %patch95 -p1 %patch96 -p1 +popd # openjdk +%endif + +# Isolate from loongarch64 and riscv64 +%ifnarch loongarch64 riscv64 +pushd %{top_level_dir_name} %patch97 -p1 %patch98 -p1 %patch99 -p1 @@ -1970,6 +1976,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Wed Dec 17 2025 douyiwang - 1:21.0.9.10-8 +- Isolate some patches from riscv64 + * Mon Dec 8 2025 jihaodi - 1:21.0.9.10-7 - modify Add-SM2-and-KAE-for-OpenSSL3.patch -- Gitee