From ad7942bb8eb485ea3bef3cc26d98fcdf96745524 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 13 Jul 2026 19:37:59 -0400 Subject: [PATCH] Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 - Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 - Related: RHEL-188875 --- java-17-openjdk-portable.specfile | 71 ++++++++++++++++++++----------- java-17-openjdk.spec | 3 ++ 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index 504a479..9978a1d 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -315,7 +315,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 19 +%global updatever 20 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -360,12 +360,12 @@ %endif %endif %endif -%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease}) +%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease}) # 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 62c0f885e30 +%global fipsver 821eb26f706 # Define JDK versions %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} %global javaver %{featurever} @@ -379,8 +379,9 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 10 -%global rpmrelease 1 +%global buildver 8 +%global portablerelease 1 +%global rpmrelease 0 #%%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 %if %is_system_jdk @@ -524,7 +525,7 @@ ExcludeArch: %{ix86} Name: java-%{javaver}-%{origin}-portable Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -753,17 +754,17 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.14.2 +Provides: bundled(freetype) = 2.14.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h -Provides: bundled(giflib) = 6.1.2 +Provides: bundled(giflib) = 6.1.3 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 12.3.2 +Provides: bundled(harfbuzz) = 14.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.17.0 +Provides: bundled(lcms2) = 2.19.1 # 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.57 +Provides: bundled(libpng) = 1.6.58 # Version in src/java.base/share/native/libzip/zlib/zlib.h Provides: bundled(zlib) = 1.3.2 # We link statically against libstdc++ to increase portability @@ -965,19 +966,6 @@ sh %{SOURCE12} %{top_level_dir_name} # Patch the JDK pushd %{top_level_dir_name} -# This syntax is deprecated: -# %%patchN [...] -# and should be replaced with: -# %%patch -PN [...] -# For example: -# %%patch1001 -p1 -# becomes: -# %%patch -P1001 -p1 -# The replacement format suggested by recent (circa Fedora 38) RPM -# deprecation messages: -# %%patch N [...] -# is not backward-compatible with prior (circa RHEL-8) versions of -# rpmbuild. %patch -P1 -p1 %patch -P6 -p1 # Add crypto policy and FIPS support @@ -1838,6 +1826,41 @@ done %endif %changelog +* Mon Jul 13 2026 Andrew Hughes - 1:17.0.20.0.8-1.0 +- Update NEWS for jdk-17.0.20+8 (GA) + +* Mon Jul 13 2026 Thomas Fitzsimmons - 1:17.0.20.0.8-1.0 +- Update to jdk-17.0.20+8 (GA) +- Add to .gitignore openjdk-17.0.20+8.tar.xz +- Set buildver 8 +- Set is_ga to 1 +- Update sources to openjdk-17.0.20+8.tar.xz +- ** This tarball is embargoed until 2026-07-21 @ 1pm PT. ** + +* Mon Jul 13 2026 Andrew Hughes - 1:17.0.20.0.7-0.1.0.ea +- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field +- Resolves: OPENJDK-4876 + +* Wed Jul 08 2026 Andrew Hughes - 1:17.0.20.0.7-0.1.ea +- Add NEWS individual note about JDK-8354469 +- Add NEWS individual note about JDK-8372351 + +* Tue Jul 07 2026 Thomas Fitzsimmons - 1:17.0.20.0.7-0.1.ea +- Update to jdk-17.0.20+7 (EA) +- Add to .gitignore openjdk-17.0.20+7-ea.tar.xz +- Set updatever to 20 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.20+7-ea.tar.xz +- Set fipsver to 821eb26f706 +- Delete comments about patch macro syntax +- Set bundled freetype version to 2.14.3 +- Set bundled giflib version to 6.1.3 +- Set bundled harfbuzz version to 14.2.0 +- Set bundled lcms2 version to 2.19.1 +- Set bundled libpng version to 1.6.58 +- Update NEWS for jdk-17.0.20+7 (EA) + * Fri Apr 17 2026 Thomas Fitzsimmons - 1:17.0.19.0.10-1 - Set fipsver to 62c0f885e30 diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 1211e78..59ad1da 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2499,6 +2499,9 @@ cjc.mainProgram(args) %endif %changelog +* Mon Jul 13 2026 Thomas Fitzsimmons - 1:17.0.20.0.8-1.1 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 + * Mon Jul 13 2026 Andrew Hughes - 1:17.0.20.0.8-1.1 - Sync NEWS from private-gnu_andrew-rhel-8.5-vanilla