Rebuild for OpenMPI-4.1.0 and MPICH-3.4.1

This commit is contained in:
Antonio T 2021-02-03 12:27:18 +01:00
parent 8ec405dfc6
commit 412a009d55

View File

@ -274,12 +274,14 @@
--with-pthread=1 \\\ --with-pthread=1 \\\
--with-valgrind=1 --with-valgrind=1
%global mpichversion %(rpm -qi mpich | awk -F': ' '/Version/ {print $2}')
%global openmpiversion %(rpm -qi openmpi | awk -F': ' '/Version/ {print $2}')
%global releasever 3.14 %global releasever 3.14
Name: petsc Name: petsc
Summary: Portable Extensible Toolkit for Scientific Computation Summary: Portable Extensible Toolkit for Scientific Computation
Version: %{releasever}.2 Version: %{releasever}.2
Release: 4%{?dist} Release: 5%{?dist}
License: BSD License: BSD
URL: https://www.mcs.anl.gov/petsc URL: https://www.mcs.anl.gov/petsc
Source0: https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-%{version}.tar.gz Source0: https://www.mcs.anl.gov/petsc/mirror/release-snapshots/petsc-%{version}.tar.gz
@ -442,7 +444,7 @@ modeled by partial differential equations.
%package openmpi-devel %package openmpi-devel
Summary: Portable Extensible Toolkit for Scientific Computation (OpenMPI) Summary: Portable Extensible Toolkit for Scientific Computation (OpenMPI)
Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} Requires: %{name}-openmpi%{?_isa} = %{version}-%{release}
Requires: openmpi-devel%{?_isa} Requires: openmpi-devel%{?_isa} = 0:%{openmpiversion}
%description openmpi-devel %description openmpi-devel
Portable Extensible Toolkit for Scientific Computation (developer files). Portable Extensible Toolkit for Scientific Computation (developer files).
%endif %endif
@ -462,7 +464,7 @@ Requires: petsc-openmpi%{?_isa}
Requires: hdf5-openmpi%{?_isa} Requires: hdf5-openmpi%{?_isa}
Requires: scalapack-openmpi%{?_isa} Requires: scalapack-openmpi%{?_isa}
Requires: ptscotch-openmpi%{?_isa} Requires: ptscotch-openmpi%{?_isa}
Requires: openmpi%{?_isa} Requires: openmpi%{?_isa} = 0:%{openmpiversion}
Requires: MUMPS-openmpi%{?_isa} Requires: MUMPS-openmpi%{?_isa}
Obsoletes: %{pymodule_name}-openmpi < 0:3.14.0-3 Obsoletes: %{pymodule_name}-openmpi < 0:3.14.0-3
@ -489,7 +491,7 @@ Requires: petsc-mpich%{?_isa}
Requires: hdf5-mpich%{?_isa} Requires: hdf5-mpich%{?_isa}
Requires: scalapack-openmpi%{?_isa} Requires: scalapack-openmpi%{?_isa}
Requires: ptscotch-mpich%{?_isa} Requires: ptscotch-mpich%{?_isa}
Requires: mpich%{?_isa} Requires: mpich%{?_isa} = 0:%{mpichversion}
Requires: MUMPS-mpich%{?_isa} Requires: MUMPS-mpich%{?_isa}
Obsoletes: %{pymodule_name}-mpich < 0:3.14.0-3 Obsoletes: %{pymodule_name}-mpich < 0:3.14.0-3
@ -542,9 +544,7 @@ BuildRequires: fftw-devel
BuildRequires: fftw-mpich-devel BuildRequires: fftw-mpich-devel
%endif %endif
Requires: gcc-gfortran%{?_isa} Requires: gcc-gfortran%{?_isa}
Requires: mpich%{?_isa} = 0:%{mpichversion}
%global mpichversion %(rpm -qi mpich | awk -F': ' '/Version/ {print $2}')
Requires: mpich%{?_isa} >= 0:%{mpichversion}-1
%description mpich %description mpich
PETSc, pronounced PET-see (the S is silent), is a suite of data structures PETSc, pronounced PET-see (the S is silent), is a suite of data structures
@ -558,7 +558,7 @@ Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
# https://bugzilla.redhat.com/show_bug.cgi?id=1397192 # https://bugzilla.redhat.com/show_bug.cgi?id=1397192
Requires: mpich-devel Requires: mpich-devel
%else %else
Requires: mpich-devel%{?_isa} Requires: mpich-devel%{?_isa} = 0:%{mpichversion}
%endif %endif
%description mpich-devel %description mpich-devel
Portable Extensible Toolkit for Scientific Computation (developer files). Portable Extensible Toolkit for Scientific Computation (developer files).
@ -1130,6 +1130,10 @@ xvfb-run -a make all test -C build64 V=1 MPIEXEC='%{_builddir}/%{name}-%{version
%endif %endif
%changelog %changelog
* Tue Feb 02 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.14.2-5
- Rebuild for OpenMPI-4.1.0 and MPICH-3.4.1
- Explicit MPI dependencies
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.2-4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild