From 4407161e4dfc79367015d1b4613e7b7da16395ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 4 Apr 2018 11:06:35 +0200 Subject: [PATCH 1/2] Update MANPATH so that normal man pages can still be found --- mpich-modules.patch | 2 +- mpich.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mpich-modules.patch b/mpich-modules.patch index 70e5999..fd9237b 100644 --- a/mpich-modules.patch +++ b/mpich-modules.patch @@ -24,7 +24,7 @@ +setenv MPI_HOME @LIBDIR@ prepend-path PATH @bindir@ +prepend-path LD_LIBRARY_PATH @libdir@ - prepend-path MANPATH @mandir@ + prepend-path MANPATH :@mandir@ - -# Undefine prefix and exec_prefix which are too generic environment variables. -unsetenv prefix diff --git a/mpich.spec b/mpich.spec index 599e3ea..fb34c2d 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,7 +1,7 @@ Summary: A high-performance implementation of MPI Name: mpich Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mpich.org/ @@ -268,6 +268,9 @@ make check VERBOSE=1 %{python3_sitearch}/%{name}.pth %changelog +* Wed Apr 4 2018 Zbigniew Jędrzejewski-Szmek - 3.2.1-3 +- Update MANPATH so that normal man pages can still be found (#1533717) + * Sun Nov 12 2017 Zbigniew Jędrzejewski-Szmek - 3.2.1-2 - Update $modincdir in mpifort after moving .mod files (#1301533) - Move compiler wrappers to mpich-devel (#1353621) From 2b59b245f485e9a37ee1f79a48b7810e9231a2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 4 Apr 2018 14:17:12 +0200 Subject: [PATCH 2/2] Fix patch --- mpich-modules.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mpich-modules.patch b/mpich-modules.patch index fd9237b..d8d4ab2 100644 --- a/mpich-modules.patch +++ b/mpich-modules.patch @@ -1,5 +1,5 @@ ---- a/src/packaging/envmods/mpich.module.in 2015-02-20 15:48:13.000000000 -0500 -+++ b/src/packaging/envmods/mpich.module.in.new 2015-08-27 15:27:43.667837212 -0400 +--- mpich-3.2.1/src/packaging/envmods/mpich.module.in.orig 2017-11-11 03:19:44.000000000 +0100 ++++ mpich-3.2.1/src/packaging/envmods/mpich.module.in 2018-04-04 14:14:16.553160669 +0200 @@ -3,12 +3,23 @@ # MPICH module for use with 'environment-modules' package: # @@ -23,10 +23,11 @@ +setenv MPI_SUFFIX _@MPINAME@ +setenv MPI_HOME @LIBDIR@ prepend-path PATH @bindir@ -+prepend-path LD_LIBRARY_PATH @libdir@ - prepend-path MANPATH :@mandir@ +-prepend-path MANPATH @mandir@ - -# Undefine prefix and exec_prefix which are too generic environment variables. -unsetenv prefix -unsetenv exec_prefix ++prepend-path LD_LIBRARY_PATH @libdir@ ++prepend-path MANPATH :@mandir@ +prepend-path PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig