diff --git a/.files b/.files index 3697606..e566c40 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 6c4915a..44d531a 100644 --- a/.rev +++ b/.rev @@ -44,4 +44,12 @@ - Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8604). 755688 + + 291034aa04b32d87955ade05cba40bae + 1.13.1 + + dimstar_suse + + 821888 + diff --git a/adios.changes b/adios.changes index e54129b..8b9fad8 100644 --- a/adios.changes +++ b/adios.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Mon Jul 20 12:16:03 UTC 2020 - Stefan Brüns + +- Adapt to HPC module netcdf naming change (boo#1174291). + +------------------------------------------------------------------- +Sat Jul 18 22:59:18 UTC 2020 - Stefan Brüns + +- Drop numpy build dependency. The numpy wrapper is currently not + built, and can be built separately. +- Add -fallow-argument-mismatch Fortran flag to workaround + GFortran10 being more strict by default. + +------------------------------------------------------------------- Sat Nov 30 14:01:36 UTC 2019 - Stefan Brüns - Correct naming of openmpi1 packages in Leap 15.0/15.1 (still diff --git a/adios.spec b/adios.spec index dcfda10..d09b276 100644 --- a/adios.spec +++ b/adios.spec @@ -1,7 +1,7 @@ # # spec file for package adios # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -235,7 +235,7 @@ ExclusiveArch: do_not_build %if %{with hpc} %{hpc_init %{?compiler_family:-c %{compiler_family} %{?c_f_ver:-v %{c_f_ver}}} %{?with_mpi:-m %{?mpi_flavor}} %{?mpi_ver:-V %{?mpi_ver}} %{?ext:-e %{ext}}} - %{hpc_modules_init phdf5 pnetcdf} + %{hpc_modules_init phdf5 netcdf} %global hpc_module_pname %{pname} %define pkg_prefix %{hpc_prefix} %define pkg_bindir %{hpc_bindir} @@ -278,7 +278,6 @@ BuildRequires: fdupes BuildRequires: libbz2-devel BuildRequires: liblz4-devel BuildRequires: python -BuildRequires: python-numpy BuildRequires: zlib-devel %if %{without hpc} BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel @@ -367,7 +366,12 @@ export MPICC=mpicc export MPICXX=mpicxx export MPIFC=mpif90 export CFLAGS="-fPIC %{optflags}" +%if 0%{?suse_version} >= 1550 || 0%{?c_f_ver} >= 10 +# https://github.com/ornladios/ADIOS/issues/206 +export FCFLAGS="-fPIC %{optflags} -fallow-argument-mismatch" +%else export FCFLAGS="-fPIC %{optflags}" +%endif export LDFLAGS="-pie" %if %{without hpc}