From 1c9aa428a94012367cb064f608e45f654d316840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 16 Nov 2015 15:24:27 -0500 Subject: [PATCH] Update requires and fix MPI_FORTRAN_MOD_DIR var --- mpich-modules.patch | 2 +- mpich.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mpich-modules.patch b/mpich-modules.patch index 4b786b9..66881d9 100644 --- a/mpich-modules.patch +++ b/mpich-modules.patch @@ -12,7 +12,7 @@ -setenv exec_prefix @exec_prefix@ +setenv MPI_BIN @LIBDIR@/bin +setenv MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@ -+setenv MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@-@ARCH@ ++setenv MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@ +setenv MPI_INCLUDE @includedir@ +setenv MPI_LIB @libdir@ +setenv MPI_MAN @mandir@ diff --git a/mpich.spec b/mpich.spec index 4b27553..0555dda 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,7 +1,7 @@ Summary: A high-performance implementation of MPI Name: mpich Version: 3.1.4 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Group: Development/Libraries URL: http://www.mpich.org/ @@ -24,7 +24,7 @@ BuildRequires: rpm-mpi-hooks Provides: mpi Provides: mpich2 = 3.0.1 Obsoletes: mpich2 < 3.0 -Requires: environment-modules +Requires: environment(modules) %description MPICH is a high-performance and widely portable implementation of the Message @@ -237,6 +237,9 @@ make check VERBOSE=1 %{_datadir}/%{name}/doc/ %changelog +* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek - 3.1.4-9 +- Update requires and fix MPI_FORTRAN_MOD_DIR var + * Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek - 3.1.4-8 - Move fortran .mod files to %%{_fmoddir}/mpich (#1154991) - Move man pages to arch-specific dir (#1264359)