|
|
|
|
@ -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 <mmathesi@redhat.com> - 4.2.15-2
|
|
|
|
|
- Minor conditional fix for ELN
|
|
|
|
|
|
|
|
|
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.2.15-2
|
|
|
|
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
|
|
|
|
|
|
|
|
|
|
Merlin Mathesius
4 years ago