From 54fc40f5aa403f22dd9ad65482013245f9bad8e1de942fd677ccb9b3e8591f83 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 26 Nov 2019 16:41:04 +0000 Subject: [PATCH] Accepting request 751019 from home:StefanBruens:branches:science Fix openmpi flavor on TW, depends on https://build.opensuse.org/request/show/751017 - Reflect renaming of openmpi packages to openmpi1 in Tumbleweed, fixes unresolvable packages. OBS-URL: https://build.opensuse.org/request/show/751019 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=38 --- mumps.changes | 6 ++++++ mumps.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mumps.changes b/mumps.changes index db08f64..93c6a9c 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 25 21:52:36 UTC 2019 - Stefan Brüns + +- Reflect renaming of openmpi packages to openmpi1 in Tumbleweed, + fixes unresolvable packages. + ------------------------------------------------------------------- Mon Sep 9 07:47:02 UTC 2019 - Ana Guerrero Lopez diff --git a/mumps.spec b/mumps.spec index fb5047f..83b2906 100644 --- a/mumps.spec +++ b/mumps.spec @@ -166,8 +166,8 @@ ExclusiveArch: do_not_build %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} -# For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" +# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 +%if 0%{?suse_version} >= 1550 || "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" %define mpi_ext %{?mpi_ver} %endif @@ -327,6 +327,9 @@ Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel Requires: mumps-scotch-devel = %{version} Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel %endif + %if "%{mpi_family}%{?mpi_ext}" == "openmpi1" +Provides: %{pname}%{?scotch:-%{scotch}}-openmpi-devel + %endif %else # mpi Requires: blas-devel Requires: lapack-devel