From 5aa786f208c0b1692f3783f77db51174b05609a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Sun, 28 Aug 2022 11:55:58 +0200 Subject: [PATCH] Backport java_arches macro from Fedora Fedora java packages now make use of a java_arches macro to only build on specific arches. Backport this to EPEL to allow those packages to be built in EPEL without modification. https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- epel-rpm-macros.spec | 5 ++++- macros.epel-rpm-macros | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 84d45ad..597f835 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 8 -Release: 32 +Release: 33 Summary: Extra Packages for Enterprise Linux RPM macros License: GPLv2 @@ -112,6 +112,9 @@ install -Dpm 644 %{SOURCE150} \ %changelog +* Wed Aug 24 2022 Iñaki Úcar - 8-33 +- Backport java_arches macro from Fedora + * Sat Jul 16 2022 Maxwell G - 8-32 - Explicitly Require python3-rpm-generators - Remove %%__pythondist_provides from pythondist.attr. diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index 595fa57..d229bc6 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -111,3 +111,6 @@ # qt5 macro removed from RHEL8 but needed to ensure qtwebengine, and # its dependencies build on supported arches. %qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el + +# Arches that OpenJDK and dependent packages run on +%java_arches aarch64 ppc64le s390x x86_64