diff --git a/dl_poly-makefile b/dl_poly-makefile index 108af4a..8edde2b 100644 --- a/dl_poly-makefile +++ b/dl_poly-makefile @@ -1,5 +1,3 @@ -FFLAGS = $(RPM_OPT_FLAGS) -O3 -ffast-math $(NATIVE) -Wno-unused-variable - ifeq ($(PAR),1) TYPE = par include ../build/MakePAR diff --git a/dl_poly.spec b/dl_poly.spec index 91fc329..f4d0319 100644 --- a/dl_poly.spec +++ b/dl_poly.spec @@ -18,7 +18,7 @@ Name: dl_poly Version: 1.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: General purpose classical molecular dynamics (MD) simulation License: BSD URL: https://gitlab.com/DL_POLY_Classic @@ -116,7 +116,11 @@ cp %{SOURCE1} source/Makefile %else %global native NATIVE= %endif -echo %{build_cflags} +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 +%global aam -fallow-argument-mismatch +%endif +export FFLAGS="%build_fflags -O3 -ffast-math $(NATIVE) -Wno-unused-variable %{?aam}" +export LDFLAGS="%build_ldflags" # Parallel make fails. Extra opt flags are from the original. %global dobuild \ mkdir $MPI_COMPILER;\ @@ -200,6 +204,9 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %changelog +* Mon Jan 27 2020 Dave Love - 1.10-6 +- Fix FTBFS with gfortran 10 + * Mon Aug 19 2019 Dave love - 1.10-5 - Update URLs