Adapted to rpm 4.17 and cjc 4.0
As rpm 4.17 dropped arg from varaibale table, cjc now have to be sued as module. cjc 4.0 was converted to module
This commit is contained in:
parent
2e183d309d
commit
7c44d4d12d
@ -311,7 +311,7 @@
|
||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||
# eg jdk8u60-b27 -> b27
|
||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||
%global rpmrelease 0
|
||||
%global rpmrelease 1
|
||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
@ -1107,7 +1107,7 @@ Requires: lksctp-tools%{?_isa}
|
||||
# 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.3
|
||||
Requires: copy-jdk-configs >= 3.9
|
||||
OrderWithRequires: copy-jdk-configs
|
||||
# for printing support
|
||||
Requires: cups-libs
|
||||
@ -2326,7 +2326,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"
|
||||
@ -2355,8 +2361,9 @@ 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}"}
|
||||
require "copy_jdk_configs.lua"
|
||||
cjc.mainProgram(arg)
|
||||
|
||||
%post
|
||||
%{post_script %{nil}}
|
||||
@ -2534,6 +2541,9 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Apr 29 2021 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.292.b10-1
|
||||
- adapted to newst cjc to fix issue with rpm 4.17
|
||||
|
||||
* Tue Apr 13 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.292.b10-0
|
||||
- Update to aarch64-shenandoah-jdk8u292-b10 (GA)
|
||||
- Update release notes for 8u292-b10.
|
||||
|
Loading…
Reference in New Issue
Block a user