From a92a9fcbea530c9c15edf6906a078b46d63637e1 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 14 Jan 2025 20:03:45 -0500 Subject: [PATCH] Revert "Require tzdata-java 2024b at runtime and for build" - Set rpmrelease to 3 - Revert "Require tzdata-java 2024b at runtime and for build" This reverts commit 9250a4d8f6f4f929b490c66cf87048b1ace2182f. tzdata-java >= 2024b is not available in the buildroot. Related: RHEL-73545 --- java-17-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 02ad05e..3bcab94 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -381,7 +381,7 @@ %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 8.6 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 %global portablesuffix el8 @@ -1127,7 +1127,7 @@ Requires: ca-certificates Requires: javapackages-filesystem # Require zone-info data provided by tzdata-java sub-package # 2024a required as of JDK-8325150 -Requires: tzdata-java >= 2024b +Requires: tzdata-java >= 2024a # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1458,7 +1458,7 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ BuildRequires: libffi-devel %endif # 2024a required as of JDK-8325150 -BuildRequires: tzdata-java >= 2024b +BuildRequires: tzdata-java >= 2024a # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -2499,6 +2499,10 @@ cjc.mainProgram(args) %endif %changelog +* Wed Jan 15 2025 Thomas Fitzsimmons - 1:17.0.14.0.7-3 +- Set rpmrelease to 3 +- Revert "Require tzdata-java 2024b at runtime and for build" + * Tue Jan 14 2025 Thomas Fitzsimmons - 1:17.0.14.0.7-2 - Do not pass nil to _jvmdir macro in cjc logic - Related: RHEL-73867