From 3f11c93f7cefccc7a4e9ae34afeb6a8e94a1b861 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sat, 12 Apr 2025 02:27:12 +0100 Subject: [PATCH] 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 --- java-21-openjdk-portable.specfile | 13 ++++++++++--- java-21-openjdk.spec | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 1d56ee3..6b5bc4b 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -325,7 +325,7 @@ # New Version-String scheme-style defines %global featurever 21 %global interimver 0 -%global updatever 6 +%global updatever 7 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # 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 %global icedteaver 6.0.0pre00-c848b93a8598 # Define current Git revision for the FIPS support patches -%global fipsver 0a42e29b391 +%global fipsver 9203d50836c # Define JDK versions %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} %global javaver %{featurever} @@ -389,7 +389,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 6 %global rpmrelease 1 #%%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 @@ -1935,6 +1935,13 @@ done %endif %changelog +* Fri Apr 11 2025 Andrew Hughes - 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 - 1:21.0.6.0.7-1 - Update to jdk-21.0.6+7 (GA) - Update release notes to 21.0.6+7 diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index e0c2a90..c1b8355 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2566,6 +2566,7 @@ cjc.mainProgram(args) - Update release notes to 21.0.7+6 - Rebase FIPS support against 21.0.7+5 - 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. ** - Resolves: RHEL-86984 - Resolves: RHEL-86635