From d9230b6a7ef0e8f321e6c58572d39c837aed3d4b Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 15 Jan 2026 12:01:56 -0500 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-139552 --- java-17-openjdk-portable.specfile | 21 +++++++++++++++++---- java-17-openjdk.spec | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index ecdfb7c..6f74226 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 17 +%global updatever 18 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -379,7 +379,7 @@ %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 buildver 7 %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 @@ -399,7 +399,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 "" @@ -762,7 +762,7 @@ Provides: bundled(lcms2) = 2.17.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.47 +Provides: bundled(libpng) = 1.6.51 # 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 @@ -1832,6 +1832,19 @@ done %endif %changelog +* Tue Jan 13 2026 Thomas Fitzsimmons - 1:17.0.18.0.7-0.1.ea +- Update to jdk-17.0.18+7 (EA) +- Add to .gitignore openjdk-17.0.18+7-ea.tar.xz +- Set updatever to 18 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.18+7-ea.tar.xz +- Set bundled libpng version to 1.6.51 +- Adjust attributes in nss.fips.cfg.in in fips-17u-df4c415ac9a.patch +- Related: OPENJDK-4013 +- Related: RHEL-122136 +- Update NEWS for jdk-17.0.18+7 (EA) + * Thu Oct 16 2025 Andrew Hughes - 1:17.0.17.0.10-1 - Update NEWS for jdk-17.0.17+10 (GA) - Move prior JDK-8309841 release note to appropriate section diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 012c5b0..f801c7c 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2518,6 +2518,7 @@ cjc.mainProgram(args) - Set is_ga to 0 - Update sources to openjdk-17.0.18+7-ea.tar.xz - Set bundled libpng version to 1.6.51 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 * Thu Oct 16 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 - Update to jdk-17.0.17+10 (GA)