From 60ef5c189040dc28a8d37644ab2368477ff8c207 Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 29 Apr 2021 17:46:13 +0200 Subject: [PATCH] adapted to debug handling in newer cjc The rest of the "rpm 4.17" patch must NOT be backported, as on rpm 4.16 and down, it would casue double execution --- java-latest-openjdk.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index ed3ef5f..65b5baa 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -298,7 +298,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%global rpmrelease 1 +%global rpmrelease 2 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -2004,7 +2004,13 @@ done -- 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 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" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2221,6 +2227,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Apr 29 2021 Jiri Vanek - 1:16.0.1.0.9-2.rolling +- adapted to debug handling in newer cjc +- The rest of the "rpm 4.17" patch must NOT be backported, as on rpm 4.16 and down, it would casue double execution + * Sun Apr 25 2021 Petra Alice Mikova - 1:16.0.1.0.9-1.rolling - update to 16.0.1+9 april cpu tag - dropped jdk8259949-allow_cf-protection_on_x86.patch