From 290260f59dc2c8f6ee26dff3f004ebc09922f678 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 13 Oct 2024 23:20:26 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update ** This tarball is embargoed until 2024-10-15 @ 1pm PT. ** - Related: RHEL-61346 --- java-21-openjdk-portable.specfile | 17 +++++++++++++++-- java-21-openjdk.spec | 9 +++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index c5ca3b7..ec8c58b 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -381,7 +381,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 10 %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 @@ -401,7 +401,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -652,6 +652,8 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # OpenJDK patches in need of upstreaming # ############################################# +# Revert backport of JDK-8327501 & JDK-8328366 +Patch2001: jdk8327501-8328366-revert.patch # Currently empty @@ -961,6 +963,8 @@ sh %{SOURCE12} %{top_level_dir_name} pushd %{top_level_dir_name} # Add crypto policy and FIPS support %patch -P1001 -p1 +# Backport reversion +%patch -P2001 -p1 popd # openjdk @@ -1838,6 +1842,15 @@ done %endif %changelog +* Sat Oct 12 2024 Andrew Hughes - 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 - 1:21.0.5.0.9-0.1.ea - Update to jdk-21.0.5+9 (EA) - Update release notes to 21.0.5+9 diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 566371b..f73ce8a 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -366,7 +366,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 10 -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -2535,7 +2535,12 @@ require "copy_jdk_configs.lua" %endif %changelog -* Sat Oct 12 2024 Andrew Hughes - 1:21.0.5.0.10-1 +* Sun Oct 13 2024 Andrew Hughes - 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 - 1:21.0.5.0.10-2 - Update to jdk-21.0.5+10 (GA) - Update release notes to 21.0.5+10 - Bump giflib version to 5.2.2 following JDK-8328999