From 505d7eed761ed8731d7630c7398749c2d2c1d837 Mon Sep 17 00:00:00 2001 From: DXwangg Date: Mon, 11 Sep 2023 19:35:02 +0800 Subject: [PATCH] Fix openjfx bindings issues --- openjdk-1.8.0.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 980e333..b0e7be4 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -130,7 +130,7 @@ # New Version-String scheme-style defines %global majorver 8 -%ifnarch riscv64 +%ifarch riscv64 %global with_openjfx_binding 0 %else %global with_openjfx_binding 1 @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 7 +Release: 8 # 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 @@ -2340,10 +2340,10 @@ else return end end -arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua" +-- run content of included file with fake args cjc = require "copy_jdk_configs.lua" -args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(args) +arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(arg) %post %{post_script %{nil}} @@ -2480,6 +2480,9 @@ cjc.mainProgram(args) %endif %changelog +* Mon Sep 11 2023 kuenking111 - 1:1.8.0.382-b05.8 +- Fix openjfx bingding issues + * Wed Sep 6 2023 kuenking111 - 1:1.8.0.382-b05.7 - del 0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch -- Gitee