From 3e673db677285071d16218c07e06753cbd99a970 Mon Sep 17 00:00:00 2001 From: zhangshaoning Date: Mon, 30 May 2022 09:47:15 +0000 Subject: [PATCH] fix %pretrans headless fail --- openjdk-latest.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openjdk-latest.spec b/openjdk-latest.spec index ca896ef..b74a9b0 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -176,7 +176,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 9 -%global rpmrelease 2 +%global rpmrelease 3 # 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 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -1621,10 +1621,10 @@ else return end end --- run content of included file with fake args +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" 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) +args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(args) %post %{post_script %{nil}} @@ -1749,6 +1749,9 @@ cjc.mainProgram(arg) %changelog +* Mon May 30 2022 zhangshaoning - 1:17.0.2.9-3.rolling +- fix %pretrans headless fail + * Tue Mar 29 2022 eapen - 1:17.0.2.9-2.rolling - Downgrade symbols to provide compalibility to lower glibc -- Gitee