From 69593b3c972300587a28fe09730314ceb1413207 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 15 Nov 2019 17:07:43 -0700 Subject: [PATCH] Allow for no MPI_PYTHON{2}_SITEARCH --- mpi.prov | 2 +- mpi.req | 2 +- rpm-mpi-hooks.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mpi.prov b/mpi.prov index 5a672cf..09a3d88 100755 --- a/mpi.prov +++ b/mpi.prov @@ -52,7 +52,7 @@ if [ -e /etc/profile.d/modules.sh ]; then mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER} - else + elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER} fi if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then diff --git a/mpi.req b/mpi.req index f859fad..7bc422e 100755 --- a/mpi.req +++ b/mpi.req @@ -54,7 +54,7 @@ if [ -e /etc/profile.d/modules.sh ]; then mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER} - else + elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER} fi if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then diff --git a/rpm-mpi-hooks.spec b/rpm-mpi-hooks.spec index 27be5fc..477fa69 100644 --- a/rpm-mpi-hooks.spec +++ b/rpm-mpi-hooks.spec @@ -1,6 +1,6 @@ Name: rpm-mpi-hooks Version: 6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM dependency generator hooks for MPI packages License: MIT @@ -46,6 +46,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req %changelog +* Fri Nov 15 2019 Orion Poplawski - 6-4 +- Allow for no MPI_PYTHON{2}_SITEARCH + * Fri Jul 26 2019 Fedora Release Engineering - 6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild