From 7a43c7b812b646c837497a1268c738c7a710911a0bed84f2d538d75377d89e9f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 3 Dec 2019 16:01:38 +0000
Subject: [PATCH] Accepting request 753302 from home:eeich:branches:science

- Set %mpi_ver for scotch-openmpi
- Remove requires for libblacs from HPC builds which is not
  required there.

- Add support for gcc7 builds for HPC.
- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766 &
  jsc#SLE-8609).

OBS-URL: https://build.opensuse.org/request/show/753302
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=40
---
 _multibuild   |  5 +++--
 mumps.changes | 12 ++++++++++--
 mumps.spec    |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/_multibuild b/_multibuild
index bddbb37..91efebd 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,10 +1,11 @@
 <multibuild>
   <package>serial</package>
-  <package>openmpi</package>
+  <package>openmpi1</package>
   <package>openmpi2</package>
+  <package>openmpi3</package>
   <package>mvapich2</package>
   <package>scotch-serial</package>
-  <package>scotch-openmpi</package>
+  <package>scotch-openmpi1</package>
   <package>scotch-openmpi2</package>
   <package>gnu-openmpi-hpc</package>
   <package>gnu-openmpi2-hpc</package>
diff --git a/mumps.changes b/mumps.changes
index a4c99b5..57a4823 100644
--- a/mumps.changes
+++ b/mumps.changes
@@ -1,8 +1,16 @@
+-------------------------------------------------------------------
+Tue Dec  3 12:06:39 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Set %mpi_ver for scotch-openmpi
+- Remove requires for libblacs from HPC builds which is not
+  required there.
+
 -------------------------------------------------------------------
 Fri Nov 29 22:10:30 UTC 2019 - Egbert Eich <eich@suse.com>
 
-- Add support for gcc7.
-- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609).
+- Add support for gcc7 builds for HPC.
+- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766 &
+  jsc#SLE-8609).
 
 -------------------------------------------------------------------
 Thu Nov 28 16:16:49 UTC 2019 - Egbert Eich <eich@suse.com>
diff --git a/mumps.spec b/mumps.spec
index 353e063..eca4429 100644
--- a/mumps.spec
+++ b/mumps.spec
@@ -52,7 +52,7 @@ ExclusiveArch:  do_not_build
 %bcond_without scotch
 %endif
 
-%if "%{flavor}" == "openmpi"
+%if "%{flavor}" == "openmpi1"
 %define mpi_family  openmpi
 %define mumps_f77_mpilibs -lmpi_mpifh -lmpi
 %define mpi_ver 1
@@ -72,9 +72,10 @@ ExclusiveArch:  do_not_build
 %bcond_with hpc
 %endif
 
-%if "%{flavor}" == "scotch-openmpi"
+%if "%{flavor}" == "scotch-openmpi1"
 %define mpi_family  openmpi
 %define mumps_f77_mpilibs -lmpi_mpifh -lmpi
+%define mpi_ver 1
 %bcond_with hpc
 %bcond_without scotch
 %endif
@@ -360,7 +361,6 @@ BuildRequires:  lapack-devel
 BuildRequires:  %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
 BuildRequires:  %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
 BuildRequires:  fdupes
-BuildRequires:  libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
 BuildRequires:  libgomp1
 BuildRequires:  libopenblas-%{compiler_family}-hpc >=  %{openblas_vers}
 BuildRequires:  libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
@@ -574,7 +574,7 @@ module load openblas scalapack
  %define C_C mpicc
  %define F_C mpif77
  %define F_L mpif77
- %define SCALAP -lscalapack -lblacs
+ %define SCALAP -lscalapack %{!?with_hpc:-lblacs}
  %define MUMPS_LIBF77 %{!?with_hpc:-L%{my_libdir}} %{?mumps_f77_mpilibs}
  %define INCPAR %{!?with_hpc:-I%{my_incdir}}
  %define LIBPAR %{SCALAP} %{MUMPS_LIBF77}