rpms/java-17-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Adapt to newest copy-jdk-configs to fix issue with rpm 4.17

Browse Source 
- Adapt to newest cjc to fix issue with rpm 4.17
- Disable copy-jdk-configs for Flatpak builds
- Remove cjc backward compatibility, to fix when both rpm 4.16 and 4.17 are in transaction
- Resolves: rhbz#1953923
- Resolves: RHEL-73867
This commit is contained in:
Jiri Vanek 2025-01-14 17:15:23 -05:00 committed by Thomas Fitzsimmons
parent 8df0d2b56e
commit b0e7dd0301
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java-17-openjdk.spec
View File

@ -1135,7 +1135,7 @@ Requires: lksctp-tools%{?_isa}
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # 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 # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
# considered as regression # considered as regression
Requires: copy-jdk-configs >= 3.3 Requires: copy-jdk-configs >= 4.0
OrderWithRequires: copy-jdk-configs OrderWithRequires: copy-jdk-configs
%endif %endif
# for printing support # for printing support
@ -2300,9 +2300,10 @@ else
return return
end end
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"
arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} cjc = require "copy_jdk_configs.lua"
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)
%post %post
%{post_script %{nil}} %{post_script %{nil}}
@ -2498,6 +2499,13 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Mon Jan 13 2025 Jiri Vanek <jvanek@redhat.com> - 1:17.0.14.0.7-2
- Adapt to newest cjc to fix issue with rpm 4.17
- Disable copy-jdk-configs for Flatpak builds
- Remove cjc backward compatibility, to fix when both rpm 4.16 and 4.17 are in transaction
- Resolves: rhbz#1953923
- Resolves: RHEL-73867
* Mon Jan 13 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2 * Mon Jan 13 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2
- Update to jdk-17.0.14+7 (GA) - Update to jdk-17.0.14+7 (GA)
- Add to .gitignore openjdk-17.0.14+7.tar.xz - Add to .gitignore openjdk-17.0.14+7.tar.xz