From c4990c6768b3863ca6c80ab30c5ff53135977e3a Mon Sep 17 00:00:00 2001 From: kuenking Date: Sun, 11 Dec 2022 15:04:05 +0800 Subject: [PATCH] Diable copy-jdk-configs for Flatpak builds --- openjdk-latest.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 6f4b281..33d2da5 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -783,11 +783,13 @@ Requires: ca-certificates Requires: javapackages-filesystem # Require zone-info data provided by tzdata-java sub-package Requires: tzdata-java >= 2015d +%if ! 0%{?flatpak} # 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 OrderWithRequires: copy-jdk-configs +%endif # for printing support Requires: cups-libs # Post requires alternatives to install tool alternatives @@ -1625,9 +1627,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}} -- Gitee