From 7748623cb21e4c5ee351d1e50b3c85c3484de6b1 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 23 Sep 2024 16:26:46 -0400 Subject: [PATCH] Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 - Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 - Set rpmrelease to 3 - Set portablesuffix to el9 - Related: RHEL-46635 --- java-17-openjdk-portable.specfile | 11 ++++++++++- java-17-openjdk.spec | 9 +++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/java-17-openjdk-portable.specfile b/java-17-openjdk-portable.specfile index ab14483..31bf811 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_with fresh_libjvm +%bcond_without fresh_libjvm # Build with system libraries %bcond_with system_libs @@ -731,6 +731,7 @@ BuildRequires: libffi-devel %if 0%{?rhel} == 8 BuildRequires: graphviz BuildRequires: pandoc +%endif # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -1818,6 +1819,10 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Fri Aug 02 2024 Andrew Hughes - 1:17.0.12.0.7-1 +- Default to without fresh_libjvm now that java-17-openjdk-17.0.11.0.9-2.el9 is in c9s-pending +- Related: CS-2390 + * Wed Jul 10 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-1 - Update to jdk-17.0.12+7 (GA) - Update .gitignore to ignore openjdk-17.0.12+7.tar.xz @@ -1964,8 +1969,12 @@ done - Update NEWS for 17.0.12+1 - Fix fips-17u-d63771ea660.patch so that it applies to 17.0.12+1 +* Thu Apr 18 2024 Andrew Hughes - 1:17.0.11.0.9-5 +- Bump rpmrelease to rebuild for CentOS 9 + * 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) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 9132afb..07f0ca9 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -383,10 +383,10 @@ %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 7 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix el8 +%global portablesuffix el9 %global portablebuilddir /builddir/build/BUILD # 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 @@ -2496,6 +2496,11 @@ cjc.mainProgram(args) %endif %changelog +* Mon Sep 23 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-3 +- Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9 +- Set rpmrelease to 3 +- Set portablesuffix to el9 + * Wed Jul 10 2024 Thomas Fitzsimmons - 1:17.0.12.0.7-2 - Update to jdk-17.0.12+7 (GA) - Update .gitignore to ignore openjdk-17.0.12+7.tar.xz