rpms/java-17-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Require tzdata-java 2024b at runtime and for build"

Browse Source 
- Set rpmrelease to 3
- Revert "Require tzdata-java 2024b at runtime and for build"

This reverts commit 9250a4d8f6.
tzdata-java >= 2024b is not available in the buildroot.

Related: RHEL-73545
This commit is contained in:
Thomas Fitzsimmons 2025-01-14 20:03:45 -05:00
parent e77b268991
commit a92a9fcbea
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java-17-openjdk.spec
View File

@ -381,7 +381,7 @@
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 7 %global buildver 7
# rpmrelease numbering must start at 2 to be later than the 8.6 RPM # 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 # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
%global portablesuffix el8 %global portablesuffix el8
@ -1127,7 +1127,7 @@ Requires: ca-certificates
Requires: javapackages-filesystem Requires: javapackages-filesystem
# Require zone-info data provided by tzdata-java sub-package # Require zone-info data provided by tzdata-java sub-package
# 2024a required as of JDK-8325150 # 2024a required as of JDK-8325150
Requires: tzdata-java >= 2024b Requires: tzdata-java >= 2024a
# for support of kernel stream control # for support of kernel stream control
# libsctp.so.1 is being `dlopen`ed on demand # libsctp.so.1 is being `dlopen`ed on demand
Requires: lksctp-tools%{?_isa} Requires: lksctp-tools%{?_isa}
@ -1458,7 +1458,7 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{
BuildRequires: libffi-devel BuildRequires: libffi-devel
%endif %endif
# 2024a required as of JDK-8325150 # 2024a required as of JDK-8325150
BuildRequires: tzdata-java >= 2024b BuildRequires: tzdata-java >= 2024a
# Earlier versions have a bug in tree vectorization on PPC # Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8 BuildRequires: gcc >= 4.8.3-8
@ -2499,6 +2499,10 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Wed Jan 15 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 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 <fitzsim@redhat.com> - 1:17.0.14.0.7-2 * Tue Jan 14 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2
- Do not pass nil to _jvmdir macro in cjc logic - Do not pass nil to _jvmdir macro in cjc logic
- Related: RHEL-73867 - Related: RHEL-73867