diff --git a/.gitignore b/.gitignore index 7fe74a8..a9cd558 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /openjdk-17.0.10+7.tar.xz /openjdk-17.0.11+6-ea.tar.xz /openjdk-17.0.11+7-ea.tar.xz +/openjdk-17.0.11+9.tar.xz diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index 9a6475f..a3722b0 100644 --- a/java-17-openjdk-portable.specfile +++ b/java-17-openjdk-portable.specfile @@ -24,7 +24,7 @@ # Enable static library builds by default. %bcond_without staticlibs # Build a fresh libjvm.so for use in a copy of the bootstrap JDK -%bcond_without fresh_libjvm +%bcond_with fresh_libjvm # Build with system libraries %bcond_with system_libs @@ -377,8 +377,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 -%global rpmrelease 1 +%global buildver 9 +%global rpmrelease 4 #%%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 @@ -397,7 +397,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 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -723,10 +723,13 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel BuildRequires: libffi-devel %endif # Full documentation build requirements +# pandoc is only available on RHEL/CentOS 8 +%if 0%{?rhel} == 8 BuildRequires: graphviz BuildRequires: pandoc -# 2023d required as of JDK-8322725 -BuildRequires: tzdata-java >= 2023d +%endif +# 2024a required as of JDK-8325150 +BuildRequires: tzdata-java >= 2024a # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -1777,6 +1780,27 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Thu Apr 18 2024 Andrew Hughes - 1:17.0.11.0.9-4 +- Sync release notes with upstream version: https://bit.ly/openjdk17011 +- Turn off 'fresh_libjvm' until jdk-17.0.9 or later is in the CentOS buildroot + +* Wed Apr 10 2024 Thomas Fitzsimmons - 1:17.0.11.0.9-3 +- BuildRequires tzdata-java >= 2024a (JDK-8325150) + +* Wed Apr 10 2024 Thomas Fitzsimmons - 1:17.0.11.0.9-2 +- NEWS: Add CVEs +- NEWS: Remove backed out items from changes section +- NEWS: Remove release note for JDK-8225377, which was backed out + +* Tue Apr 9 2024 Thomas Fitzsimmons - 1:17.0.11.0.9-1 +- Update to jdk-17.0.11+9 (GA) +- Update NEWS for 17.0.11+9 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** + +* Thu Apr 4 2024 Thomas Fitzsimmons - 1:17.0.11.0.7-0.1.ea +- Import like NEWS entries verbatim from 21.0.3 + * Thu Mar 28 2024 Thomas Fitzsimmons - 1:17.0.11.0.7-0.1.ea - Update to jdk-17.0.11+7 (EA) @@ -1827,7 +1851,7 @@ done - Remove extra stripjdk from merge * Fri Feb 2 2024 Thomas Fitzsimmons - 1:17.0.11.0.1-0.1.ea -- Use --with-source-date=version (see OPENJDK-2583) +- Use --with-source-date=version (OPENJDK-2583, OPENJDK-2730) - Update freetype bundled provides version from 2.13.0 to 2.13.2 - Update harfbuzz bundled provides version from 7.2.0 to 8.2.2 - Update libpng bundled provides version from 1.6.39 to 1.6.40 @@ -1929,6 +1953,10 @@ done - Temporarily turn off 'fresh_libjvm' due to removal of JVM_IsThreadAlive (JDK-8305425) - ** This tarball is embargoed until 2023-10-17 @ 1pm PT. ** +* Sat Sep 02 2023 Andrew Hughes - 1:17.0.8.1.1-2 +- Bump rpmrelease to rebuild for CentOS 9 +- pandoc is only available on RHEL/CentOS 8 + * Sat Sep 02 2023 Andrew Hughes - 1:17.0.8.1.1-1 - Update to jdk-17.0.8.1+1 (GA) - Update release notes to 17.0.8.1+1 diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 3ee67f3..10c4fe7 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -377,11 +377,11 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 9 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 2 # Settings used by the portable build -%global portablerelease 1 +%global portablerelease 4 %global portablesuffix el8 %global portablebuilddir /builddir/build/BUILD @@ -402,7 +402,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 0 +%global is_ga 1 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -1124,7 +1124,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 -# 2023d required as of JDK-8322725 +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot Requires: tzdata-java >= 2023d # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand @@ -1455,8 +1456,9 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -2483,6 +2485,21 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Apr 10 2024 Thomas Fitzsimmons - 1:17.0.11.0.9-2 +- Update to jdk-17.0.11+9 (GA) +- Add openjdk-17.0.11+9.tar.xz to .gitignore +- Sync java-17-openjdk-portable.specfile from openjdk-portable-rhel-8 +- Update buildver from 7 to 9 +- Update portablerelease from 1 to 4 +- Change is_ga from 0 to 1 to enable GA mode for release +- Update tzdata Requires comment to mention that 2024a is not yet in the buildroot +- Update tzdata BuildRequires comment to mention that 2024a is not yet in the buildroot +- Update tzdata BuildRequires fro 2023c to 2023d +- Update sources from openjdk-17.0.11+7-ea.tar.xz to openjdk-17.0.11+9.tar.xz +- Resolves: RHEL-27133 +- Resolves: RHEL-32392 +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** + * Thu Mar 28 2024 Thomas Fitzsimmons - 1:17.0.11.0.7-0.2.ea - Update to jdk-17.0.11+7 (EA) - Sync java-17-openjdk-portable.specfile diff --git a/sources b/sources index bb431fb..334092b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-17.0.11+7-ea.tar.xz) = 8c5cd9d2ddc12107daebbc7fe0e99c4097aea4cdc17fd06861067ee41f82ed2064edf62150b6a3f03c1b9df8eb555c253acd410c4a79dd9200194211e4ca0cd5 +SHA512 (openjdk-17.0.11+9.tar.xz) = 7abbd002a93ede19b0bb40d31afe85445c0a2c4c055813148a1cd577a3fabb217ada00be91ef75dd9e9eec3bb01c0c1d8fabae79d495ad00ce745a3442a7d8c8