From d1d9014b5a43e4ba1461f4bc8f3683afc8fe4730 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 Oct 2025 21:40:02 +0000 Subject: [PATCH] import UBI java-17-openjdk-17.0.17.0.10-1.el9 --- .gitignore | 2 +- .java-17-openjdk.metadata | 2 +- SOURCES/java-17-openjdk-portable.specfile | 32 ++++++++++++++++++++--- SPECS/java-17-openjdk.spec | 21 +++++++++++---- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 20f023e..f5cb72b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-17.0.16+8.tar.xz +SOURCES/openjdk-17.0.17+10.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/.java-17-openjdk.metadata b/.java-17-openjdk.metadata index 75e7abf..40035f9 100644 --- a/.java-17-openjdk.metadata +++ b/.java-17-openjdk.metadata @@ -1,2 +1,2 @@ -a87a011e71696e9ef687a0b5feb02f7337d960ba SOURCES/openjdk-17.0.16+8.tar.xz +cf7ab0631637d3cd06f7365725b61e242dff400a SOURCES/openjdk-17.0.17+10.tar.xz c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/SOURCES/java-17-openjdk-portable.specfile b/SOURCES/java-17-openjdk-portable.specfile index bf03fe8..ecdfb7c 100644 --- a/SOURCES/java-17-openjdk-portable.specfile +++ b/SOURCES/java-17-openjdk-portable.specfile @@ -315,7 +315,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 16 +%global updatever 17 %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 8 +%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 @@ -756,7 +756,7 @@ Provides: bundled(freetype) = 2.13.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 10.4.0 +Provides: bundled(harfbuzz) = 11.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.17.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h @@ -1832,6 +1832,32 @@ done %endif %changelog +* 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 + +* Tue Oct 14 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 +- Update to jdk-17.0.17+10 (GA) +- Add to .gitignore openjdk-17.0.17+10.tar.xz +- Set buildver to 10 +- Set is_ga to 1 +- Update sources to openjdk-17.0.17+10.tar.xz +- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. ** + +* Thu Sep 18 2025 Thomas Fitzsimmons - 1:17.0.17.0.7-0.1.ea +- Update to jdk-17.0.17+7 (EA) +- Add to .gitignore openjdk-17.0.17+7-ea.tar.xz +- Set updatever to 17 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.17+7-ea.tar.xz +- Set bundled harfbuzz version to 11.2.0 +- Update NEWS for jdk-17.0.17+7 (EA) + +* Mon Jul 21 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-1 +- Synchronize openjdk_news.sh from java-21-openjdk vanilla branch +- Resolves: OPENJDK-3950 + * Wed Jul 09 2025 Andrew Hughes - 1:17.0.16.0.8-1 - Update NEWS for jdk-17.0.16+8 (GA) diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec index f074cd5..66972f7 100644 --- a/SPECS/java-17-openjdk.spec +++ b/SPECS/java-17-openjdk.spec @@ -328,7 +328,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 16 +%global updatever 17 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -383,9 +383,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 8 -# rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 2 +%global buildver 10 +%global rpmrelease 1 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -1493,7 +1492,7 @@ Provides: bundled(freetype) = 2.13.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 10.4.0 +Provides: bundled(harfbuzz) = 11.2.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.17.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h @@ -2511,6 +2510,18 @@ cjc.mainProgram(args) %endif %changelog +* Thu Oct 16 2025 Thomas Fitzsimmons - 1:17.0.17.0.10-1 +- Update to jdk-17.0.17+10 (GA) +- Add to .gitignore openjdk-17.0.17+10.tar.xz +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 +- Set updatever to 17 +- Set buildver to 10 +- Set rpmrelease to 1, remove 'must start at 2' comment +- Set bundled harfbuzz version to 11.2.0 +- Update sources to openjdk-17.0.17+10.tar.xz +- Resolves: RHEL-119458 +- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. ** + * Wed Jul 09 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-2 - Update to jdk-17.0.16+8 - Add to .gitignore openjdk-17.0.16+8.tar.xz