Sync the copy of the portable specfile with the latest update

** This tarball is embargoed until 2025-04-15 @ 1pm PT. **

- Related: RHEL-86984
- Related: RHEL-86635
This commit is contained in:
Andrew Hughes 2025-04-12 02:27:12 +01:00
parent d334f8531e
commit 3f11c93f7c
2 changed files with 11 additions and 3 deletions

View File

@ -325,7 +325,7 @@
# New Version-String scheme-style defines # New Version-String scheme-style defines
%global featurever 21 %global featurever 21
%global interimver 0 %global interimver 0
%global updatever 6 %global updatever 7
%global patchver 0 %global patchver 0
# buildjdkver is usually same as %%{featurever}, # buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1, # but in time of bootstrap of next jdk, it is featurever-1,
@ -375,7 +375,7 @@
# Define IcedTea version used for SystemTap tapsets and desktop file # Define IcedTea version used for SystemTap tapsets and desktop file
%global icedteaver 6.0.0pre00-c848b93a8598 %global icedteaver 6.0.0pre00-c848b93a8598
# Define current Git revision for the FIPS support patches # Define current Git revision for the FIPS support patches
%global fipsver 0a42e29b391 %global fipsver 9203d50836c
# Define JDK versions # Define JDK versions
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
%global javaver %{featurever} %global javaver %{featurever}
@ -389,7 +389,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 7 %global buildver 6
%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
@ -1935,6 +1935,13 @@ done
%endif %endif
%changelog %changelog
* Fri Apr 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-1
- Update to jdk-21.0.7+6 (GA)
- Update release notes to 21.0.7+6
- Rebase FIPS support against 21.0.7+5
- ** This tarball is embargoed until 2025-04-15 @ 1pm PT. **
- Resolves: OPENJDK-3789
* Sat Jan 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1 * Sat Jan 11 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1
- Update to jdk-21.0.6+7 (GA) - Update to jdk-21.0.6+7 (GA)
- Update release notes to 21.0.6+7 - Update release notes to 21.0.6+7

View File

@ -2566,6 +2566,7 @@ cjc.mainProgram(args)
- Update release notes to 21.0.7+6 - Update release notes to 21.0.7+6
- Rebase FIPS support against 21.0.7+5 - Rebase FIPS support against 21.0.7+5
- Require tzdata 2025a due to upstream inclusion of JDK-8347965 - Require tzdata 2025a due to upstream inclusion of JDK-8347965
- Sync the copy of the portable specfile with the latest update
- ** This tarball is embargoed until 2025-04-15 @ 1pm PT. ** - ** This tarball is embargoed until 2025-04-15 @ 1pm PT. **
- Resolves: RHEL-86984 - Resolves: RHEL-86984
- Resolves: RHEL-86635 - Resolves: RHEL-86635