From 41062cec39db3040cd60f011e5360cd2d8d10bfd Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 8 Jul 2024 18:19:55 -0400 Subject: [PATCH] Update to jdk-17.0.12+6 (EA) - Add openjdk-17.0.12+6-ea.tar.xz to .gitignore - Set updatever to 12 - Set buildver to 6 - Set rpmrelease to 1 - Set is_ga to 0 - Update sources to openjdk-17.0.12+6-ea.tar.xz - Require tzdata-java 2024a at runtime and for build (JDK-8325150) - Update lcms2 bundled provides to 2.16.0 - Add zlib 1.3.1 bundled provides and zlib-devel build requirement (OPENJDK-3065) - Related: RHEL-52734 --- .gitignore | 1 + java-17-openjdk.spec | 32 +++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 7029481..cdf8a88 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /openjdk-17.0.11+6-ea.tar.xz /openjdk-17.0.11+7-ea.tar.xz /openjdk-17.0.11+9.tar.xz +/openjdk-17.0.12+6-ea.tar.xz diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 90b6aec..55c50c5 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -328,7 +328,7 @@ # New Version-String scheme-style defines %global featurever 17 %global interimver 0 -%global updatever 11 +%global updatever 12 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -383,7 +383,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 6 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM %global rpmrelease 2 # Settings used by the portable build @@ -408,7 +408,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 "" @@ -1131,8 +1131,7 @@ Requires: ca-certificates Requires: javapackages-filesystem # Require zone-info data provided by tzdata-java sub-package # 2024a required as of JDK-8325150 -# Use 2023d until 2024a is in the buildroot -Requires: tzdata-java >= 2023d +Requires: tzdata-java >= 2024a # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1467,8 +1466,7 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ BuildRequires: libffi-devel %endif # 2024a required as of JDK-8325150 -# Use 2023d until 2024a is in the buildroot -BuildRequires: tzdata-java >= 2023d +BuildRequires: tzdata-java >= 2024a # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1484,6 +1482,7 @@ BuildRequires: harfbuzz-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h Provides: bundled(freetype) = 2.13.0 @@ -1491,12 +1490,14 @@ Provides: bundled(freetype) = 2.13.0 Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 7.2.0 -# Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 +# Version in src/java.desktop/share/legal/lcms.md +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.39 +# Version in src/java.base/share/native/libzip/zlib/zlib.h +Provides: bundled(zlib) = 1.3.1 %endif # this is always built, also during debug-only build @@ -2496,6 +2497,19 @@ cjc.mainProgram(args) %endif %changelog +* Sun Aug 04 2024 Thomas Fitzsimmons - 1:17.0.12.0.6-0.1.ea +- Update to jdk-17.0.12+6 (EA) +- Add openjdk-17.0.12+6-ea.tar.xz to .gitignore +- Set updatever to 12 +- Set buildver to 6 +- Set rpmrelease to 1 +- Set is_ga to 0 +- Update sources to openjdk-17.0.12+6-ea.tar.xz +- Require tzdata-java 2024a at runtime and for build (JDK-8325150) +- Update lcms2 bundled provides to 2.16.0 +- Add zlib 1.3.1 bundled provides and zlib-devel build requirement (OPENJDK-3065) +- Related: RHEL-52734 + * Wed Jul 31 2024 Andrew Hughes - 1:17.0.11.0.9-2 - Fix gating.yaml to reference RHEL 10 - Set this to *not* be the default/system JDK providing 'java', 'jre', 'java-devel' ,etc. diff --git a/sources b/sources index 334092b..b5b095f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-17.0.11+9.tar.xz) = 7abbd002a93ede19b0bb40d31afe85445c0a2c4c055813148a1cd577a3fabb217ada00be91ef75dd9e9eec3bb01c0c1d8fabae79d495ad00ce745a3442a7d8c8 +SHA512 (openjdk-17.0.12+6-ea.tar.xz) = c18f8bafa4e5dac7d10ac3ca5def09bd68802756f83a8615e58f47eebd291a53b24a9900afd7dde38310f4d6030f27b9036c9f2656b93cb336dd5885072affc0