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

Sync the copy of the portable specfile with the latest update

Browse Source 
** This tarball is embargoed until 2024-10-15 @ 1pm PT. **

- Related: RHEL-61346
This commit is contained in:
Andrew Hughes 2024-10-13 23:20:26 +01:00
parent 011041cf7b
commit 290260f59d
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java-21-openjdk-portable.specfile
View File

@ -381,7 +381,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%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 9 %global buildver 10
%global rpmrelease 1 %global rpmrelease 1
#%%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
@ -401,7 +401,7 @@
# Release will be (where N is usually a number starting at 1): # Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases, # - 0.N%%{?extraver}%%{?dist} for EA releases,
# - N%%{?extraver}{?dist} for GA releases # - N%%{?extraver}{?dist} for GA releases
%global is_ga 0 %global is_ga 1
%if %{is_ga} %if %{is_ga}
%global build_type GA %global build_type GA
%global ea_designator "" %global ea_designator ""
@ -652,6 +652,8 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
# OpenJDK patches in need of upstreaming # OpenJDK patches in need of upstreaming
# #
############################################# #############################################
# Revert backport of JDK-8327501 & JDK-8328366
Patch2001: jdk8327501-8328366-revert.patch
# Currently empty # Currently empty
@ -961,6 +963,8 @@ sh %{SOURCE12} %{top_level_dir_name}
pushd %{top_level_dir_name} pushd %{top_level_dir_name}
# Add crypto policy and FIPS support # Add crypto policy and FIPS support
%patch -P1001 -p1 %patch -P1001 -p1
# Backport reversion
%patch -P2001 -p1
popd # openjdk popd # openjdk
@ -1838,6 +1842,15 @@ done
%endif %endif
%changelog %changelog
* Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-1
- Update to jdk-21.0.5+10 (GA)
- Update release notes to 21.0.5+10
- Switch to GA mode.
- Revert JDK-8327501 & JDK-8328366 backport until more mature.
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
- Resolves: OPENJDK-3327
- Resolves: OPENJDK-3084
* Thu Oct 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.9-0.1.ea * Thu Oct 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.9-0.1.ea
- Update to jdk-21.0.5+9 (EA) - Update to jdk-21.0.5+9 (EA)
- Update release notes to 21.0.5+9 - Update release notes to 21.0.5+9

9
java-21-openjdk.spec
View File

@ -366,7 +366,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 10 %global buildver 10
%global rpmrelease 2 %global rpmrelease 3
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
# Portable suffix differs between RHEL and CentOS # Portable suffix differs between RHEL and CentOS
@ -2535,7 +2535,12 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-1 * Sun Oct 13 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-3
- Sync the copy of the portable specfile with the latest update
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
- Related: RHEL-61346
* Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-2
- Update to jdk-21.0.5+10 (GA) - Update to jdk-21.0.5+10 (GA)
- Update release notes to 21.0.5+10 - Update release notes to 21.0.5+10
- Bump giflib version to 5.2.2 following JDK-8328999 - Bump giflib version to 5.2.2 following JDK-8328999