From e19afa3b2ec51c469e92f2b4159c971558994fb5 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 26 May 2022 23:35:11 -0500 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 b379763..30022d1 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 9 -Release: 4%{dist} +Release: 5%{dist} Summary: Extra Packages for Enterprise Linux RPM macros License: GPLv2 @@ -51,6 +51,9 @@ install -Dpm 644 %{SOURCE1} \ %changelog +* Fri May 27 2022 Carl George - 9-5 +- Backport java_arches macro from Fedora + * Tue May 17 2022 Maxwell G - 9-4 - Add `Requires: ansible-srpm-macros` diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index 01fefc7..23ee6a6 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -4,3 +4,6 @@ # Bash completions; not in bash to not intefere with install ordering %bash_completion_dir /usr/share/bash-completion/completions/ + +# Arches that OpenJDK and dependent packages run on +%java_arches aarch64 ppc64le s390x x86_64