From 4bdf40f099f1fd2e133023d26dafbcda7eaf8ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 7 May 2019 11:31:59 +0200 Subject: [PATCH] Move python3 version guard to main package /usr/share/modulefiles/mpi/mpich-* is contained in the main package, so it seems reasonable to put the Requires there. That file is specific to the python3 version that the package was built with. --- mpich.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mpich.spec b/mpich.spec index ce9b37a..e775747 100644 --- a/mpich.spec +++ b/mpich.spec @@ -29,6 +29,11 @@ Provides: mpich2 = %{version} Obsoletes: mpich2 < 3.0 Requires: environment(modules) +# Make sure this package is rebuilt with correct Python version when updating +# Otherwise mpi.req from rpm-mpi-hooks doesn't work +# https://bugzilla.redhat.com/show_bug.cgi?id=1705296 +Requires: (python(abi) = %{python3_version} if python3) + %description MPICH is a high-performance and widely portable implementation of the Message Passing Interface (MPI) standard (MPI-1, MPI-2 and MPI-3). The goals of MPICH @@ -69,11 +74,6 @@ Requires: rpm-mpi-hooks Provides: mpich2-devel = 3.0.1 Obsoletes: mpich2-devel < 3.0 -# Make sure this package is rebuilt with correct Python version when updating -# Otherwise mpi.req from rpm-mpi-hooks doesn't work -# https://bugzilla.redhat.com/show_bug.cgi?id=1705296 -Requires: (python(abi) = %{python3_version} if python3) - %description devel Contains development headers and libraries for mpich