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

Merge branch 'c8' into a8

Browse Source
This commit is contained in:
eabdullin 2023-11-16 10:24:26 +03:00
commit b3e6b0628b
3 changed files with 1925 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SOURCES/java-21-openjdk-portable.specfile
View File

@ -379,7 +379,7 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 12 %global buildver 12
%global rpmrelease 1 %global rpmrelease 2
#%%global tagsuffix %%{nil} #%%global tagsuffix %%{nil}
# 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 # 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 %if %is_system_jdk
@ -662,7 +662,8 @@ Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
# #
############################################# #############################################
# Currently empty # JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
Patch100: jdk8311630-s390_ffmapi.patch
############################################# #############################################
# #
@ -945,6 +946,8 @@ pushd %{top_level_dir_name}
%patch1001 -p1 %patch1001 -p1
# Patches in need of upstreaming # Patches in need of upstreaming
%patch6 -p1 %patch6 -p1
# Patches in next release
%patch100 -p1
popd # openjdk popd # openjdk
@ -1688,6 +1691,9 @@ done
%{_jvmdir}/%{miscportablearchive}.sha256sum %{_jvmdir}/%{miscportablearchive}.sha256sum
%changelog %changelog
* Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
* Sun Oct 29 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-1 * Sun Oct 29 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-1
- Update to jdk-21.0.1.0+12 (GA) - Update to jdk-21.0.1.0+12 (GA)
- Update release notes to 21.0.1.0+12 - Update release notes to 21.0.1.0+12

1906
SOURCES/jdk8311630-s390_ffmapi.patch Normal file
View File

File diff suppressed because it is too large Load Diff

14
SPECS/java-21-openjdk.spec
View File

@ -351,9 +351,9 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 12 %global buildver 12
%global rpmrelease 2 %global rpmrelease 3
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 2
%global portablesuffix el8 %global portablesuffix el8
%global portablebuilddir /builddir/build/BUILD %global portablebuilddir /builddir/build/BUILD
@ -1412,7 +1412,8 @@ Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
# #
############################################# #############################################
# Currently empty # JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
Patch100: jdk8311630-s390_ffmapi.patch
############################################# #############################################
# #
@ -1861,6 +1862,8 @@ pushd %{top_level_dir_name}
%patch1001 -p1 %patch1001 -p1
# Patches in need of upstreaming # Patches in need of upstreaming
%patch6 -p1 %patch6 -p1
# Patches in next release
%patch100 -p1
popd # openjdk popd # openjdk
@ -2479,6 +2482,11 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-3
- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
- Sync the copy of the portable specfile with the latest update
- Resolves: RHEL-16378
* Mon Oct 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2 * Mon Oct 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
- Switch to using portable binaries built on RHEL 7 - Switch to using portable binaries built on RHEL 7
- Sync the copy of the portable specfile with the RHEL 7 version - Sync the copy of the portable specfile with the RHEL 7 version