diff --git a/.gitignore b/.gitignore index 14b27ff..20f023e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-17.0.15+6.tar.xz +SOURCES/openjdk-17.0.16+8.tar.xz SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/.java-17-openjdk.metadata b/.java-17-openjdk.metadata index 5dc5d75..75e7abf 100644 --- a/.java-17-openjdk.metadata +++ b/.java-17-openjdk.metadata @@ -1,2 +1,2 @@ -e855ed0c9446ac21497f330fde1cba33e103e7a7 SOURCES/openjdk-17.0.15+6.tar.xz +a87a011e71696e9ef687a0b5feb02f7337d960ba SOURCES/openjdk-17.0.16+8.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 5d04f53..bf03fe8 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 15 +%global updatever 16 %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 6 +%global buildver 8 %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 @@ -752,17 +752,17 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.2 +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) = 8.2.2 +Provides: bundled(harfbuzz) = 10.4.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.16.0 +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.43 +Provides: bundled(libpng) = 1.6.47 # 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,51 @@ done %endif %changelog +* Wed Jul 09 2025 Andrew Hughes - 1:17.0.16.0.8-1 +- Update NEWS for jdk-17.0.16+8 (GA) + +* Wed Jul 09 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-1 +- Report timezone data (tz) updates in openjdk_news.sh +- Related: OPENJDK-3950 + +* Wed Jul 09 2025 Andrew Hughes - 1:17.0.16.0.8-1 +- Update get_bundle_versions.sh to match other scripts +- * get_bundle_versions.sh: Add license +- * get_bundle_versions.sh: Set compile-command in Emacs +- * get_bundle_versions.sh: Use different error codes for different failures +- * get_bundle_versions.sh: Remove unneeded '.' in JPEG version +- * get_bundle_versions.sh: shellcheck: Double-quote variable references (SC2086) +- * get_bundle_versions.sh: shellcheck: Drop use of cat and pass file to awk directly (SC2002) +- Add OpenJDK 8u support to get_bundle_versions.sh +- Print bundle updates and backouts at end of openjdk_news.sh output +- Refer user to get_bundle_versions.sh when bundle updates are found by openjdk_news.sh +- Related: OPENJDK-3950 + +* Wed Jul 09 2025 Antonio Vieiro - 1:17.0.16.0.8-1 +- Add script to obtain bundled library versions from OpenJDK sources +- Related: OPENJDK-3950 + +* Wed Jul 09 2025 Thomas Fitzsimmons - 1:17.0.16.0.8-1 +- Update to jdk-17.0.16+8 +- Add to .gitignore openjdk-17.0.16+8.tar.xz +- Set buildver to 8 +- Set is_ga to 1 +- Update sources to openjdk-17.0.16+8.tar.xz +- ** This tarball is embargoed until 2025-07-15 @ 1pm PT. ** + +* Tue Jun 24 2025 Thomas Fitzsimmons - 1:17.0.16.0.7-0.1.ea +- Update to jdk-17.0.16+7 (EA) +- Add to .gitignore openjdk-17.0.16+7-ea.tar.xz +- Set updatever to 16 +- Set buildver to 7 +- Set is_ga to 0 +- Update sources to openjdk-17.0.16+7-ea.tar.xz +- Set bundled lcms2 version to 2.17.0 +- Set bundled freetype version to 2.13.3 +- Set bundled harfbuzz version to 10.4.0 +- Set bundled libpng version to 1.6.47 +- Update NEWS for jdk-17.0.16+7 (EA) + * Thu Apr 10 2025 Andrew Hughes - 1:17.0.15.0.6-1 - Update NEWS for jdk-17.0.15+6 (GA) diff --git a/SPECS/java-17-openjdk.spec b/SPECS/java-17-openjdk.spec index a90b0f1..f074cd5 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 15 +%global updatever 16 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -383,9 +383,9 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 +%global buildver 8 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 3 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -1114,6 +1114,9 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release %if 0%{?rhel} >= 8 || 0%{?fedora} > 0 Recommends: gtk3%{?_isa} %endif +%if 0%{?rhel} >= 9 +Recommends: pipewire%{?_isa} +%endif Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release} @@ -1135,8 +1138,8 @@ Requires: ca-certificates # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem # Require zone-info data provided by tzdata-java sub-package -# 2025a required as of JDK-8347965 -Requires: tzdata-java >= 2025a +# 2025b required as of JDK-8352716 +Requires: tzdata-java >= 2025b # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1466,8 +1469,8 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2025a required as of JDK-8347965 -BuildRequires: tzdata-java >= 2025a +# 2025b required as of JDK-8352716 +BuildRequires: tzdata-java >= 2025b # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1486,17 +1489,17 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.2 +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) = 8.2.2 -# Version in src/java.desktop/share/legal/lcms.md -Provides: bundled(lcms2) = 2.16.0 +Provides: bundled(harfbuzz) = 10.4.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 Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h -Provides: bundled(libpng) = 1.6.43 +Provides: bundled(libpng) = 1.6.47 # Version in src/java.base/share/native/libzip/zlib/zlib.h Provides: bundled(zlib) = 1.3.1 %endif @@ -2508,6 +2511,34 @@ cjc.mainProgram(args) %endif %changelog +* 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 +- Set updatever to 16 +- Set buildver to 8 +- Set rpmrelease to 2 +- Update sources to openjdk-17.0.16+8.tar.xz +- Resolves: RHEL-101788 +- Resolves: RHEL-101795 +- Resolves: RHEL-101796 +- Resolves: RHEL-101797 +- Resolves: RHEL-102283 +- Resolves: RHEL-102286 +- Resolves: RHEL-102285 +- Resolves: RHEL-102284 +- Require tzdata-java 2025b at runtime and for build +- Set bundled freetype provide version to 2.13.3 +- Set bundled harfbuzz provide version to 10.4.0 +- Set bundled lcms2 provide version to 2.17.0 +- Set bundled libpng provide version to 1.6.47 +- Recommend pipewire +- Related: RHEL-102667 +- Resolves: RHEL-102669 +- Resolves: RHEL-102670 +- Resolves: RHEL-102672 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 +- ** This tarball is embargoed until 2025-07-15 @ 1pm PT. ** + * Sat Jun 14 2025 Andrew Hughes - 1:17.0.15.0.6-3 - Bump release number to appease 9.6-z erratum - Related: RHEL-86987