From ca49a5638b1c2958dcaff433728dd27eadb8a9e3 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 21 Jul 2020 16:25:12 -0500 Subject: [PATCH] Minor conditional fix for ELN Signed-off-by: Merlin Mathesius --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f2a405c..6336f56 100644 --- a/hdf.spec +++ b/hdf.spec @@ -158,7 +158,7 @@ cd build-static # Java requires shared libraries, fortran requires static # Temporary workaround for compiling on GCC-10 -%if 0%{?fedora} && 0%{?fedora} > 31 +%if (0%{?fedora} && 0%{?fedora} > 31) || (0%{?rhel} && 0%{?rhel} > 8) export FCFLAGS="%{build_fflags} -fallow-argument-mismatch" export FFLAGS="%{build_fflags} -fallow-argument-mismatch" %endif @@ -260,6 +260,9 @@ make -j1 -C build-static check %changelog +* Tue Jul 21 2020 Merlin Mathesius - 4.2.15-2 +- Minor conditional fix for ELN + * Fri Jul 10 2020 Jiri Vanek - 4.2.15-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11