From 35ed24d6741e1b79290cd8f0935c0bf8fe1f1a45 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 11 Oct 2024 19:03:23 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update - Related: RHEL-58797 --- java-21-openjdk-portable.specfile | 31 +++++++++++++++++++++++++------ java-21-openjdk.spec | 1 + 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 2a633ee..1d731d4 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -24,7 +24,8 @@ # Enable static library builds by default. %bcond_without staticlibs # Build a fresh libjvm.so for use in a copy of the bootstrap JDK -%bcond_without fresh_libjvm +# Turned off until 21.0.5+1 or higher is in the buildroot +%bcond_with fresh_libjvm # Build with system libraries %bcond_with system_libs @@ -325,7 +326,7 @@ # New Version-String scheme-style defines %global featurever 21 %global interimver 0 -%global updatever 4 +%global updatever 5 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -389,7 +390,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 9 %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 @@ -409,7 +410,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 1 +%global is_ga 0 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -758,7 +759,7 @@ BuildRequires: zlib-devel # Version in src/java.desktop/share/legal/freetype.md Provides: bundled(freetype) = 2.13.2 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h -Provides: bundled(giflib) = 5.2.1 +Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h @@ -766,7 +767,7 @@ Provides: bundled(lcms2) = 2.16.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h -Provides: bundled(libpng) = 1.6.40 +Provides: bundled(libpng) = 1.6.43 # Version in src/java.base/share/native/libzip/zlib/zlib.h Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability @@ -1938,6 +1939,24 @@ done %endif %changelog +* 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 + +* Wed Sep 18 2024 Andrew Hughes - 1:21.0.5.0.5-0.1.ea +- Update to jdk-21.0.5+5 (EA) +- Update release notes to 21.0.5+5 + +* Sun Sep 15 2024 Andrew Hughes - 1:21.0.5.0.1-0.1.ea +- Update to jdk-21.0.5+1 (EA) +- Update release notes to 21.0.5+1 +- Switch to EA mode +- Bump giflib version to 5.2.2 following JDK-8328999 +- Bump libpng version to 1.6.43 following JDK-8329004 +- Turn off fresh_libjvm following JDK-8329088 which changes jdk.internal.vm.StackChunk in CDS archive +- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options +- Make build scripts executable + * Fri Jul 12 2024 Andrew Hughes - 1:21.0.4.0.7-1 - Update to jdk-21.0.4+7 (GA) - Update release notes to 21.0.4+7 diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 39bca9a..fbf8820 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2541,6 +2541,7 @@ cjc.mainProgram(args) - Sync with RHEL 7 portable build: - Use ExclusiveArch over ExcludeArch - Make build scripts executable +- Sync the copy of the portable specfile with the latest update - Resolves: RHEL-58797 - Resolves: RHEL-17191