From 2b9b328d12e99864cfcff5ef05793951062f65f0a39c5cdbf62258ff975a1878 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 22 Feb 2018 15:35:28 +0000
Subject: [PATCH] Accepting request 579040 from
 home:NMoreyChaisemartin:branches:science:HPC

- Switch to openmpi2 instead of openmpi (bsc#1082302),
  apart from ppc64 as openmpi2 does not support it.

OBS-URL: https://build.opensuse.org/request/show/579040
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=64
---
 fftw3.changes |  6 ++++++
 fftw3.spec    | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/fftw3.changes b/fftw3.changes
index 9949b01..7bf1e25 100644
--- a/fftw3.changes
+++ b/fftw3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 22 15:02:28 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Switch to openmpi2 instead of openmpi (bsc#1082302),
+  apart from ppc64 as openmpi2 does not support it.
+
 -------------------------------------------------------------------
 Mon Jan 22 16:14:42 UTC 2018 - eich@suse.com
 
diff --git a/fftw3.spec b/fftw3.spec
index 91a6ba0..26cf2e3 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -25,6 +25,13 @@
 %define _ver 3_3_6
 %define pl_ext pl2
 
+#For non HPC builds only
+%ifarch ppc64
+%define mpi_implem openmpi
+%else
+%define mpi_implem openmpi2
+%endif
+
 %bcond_with ringdisabled
 
 %if 0%{?is_opensuse} || 0%{?is_backports}
@@ -197,7 +204,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
 Requires:       %{package_name}-libs = %{version}
 %ifnarch s390 s390x
-BuildRequires:  openmpi-devel
+BuildRequires:  %{mpi_implem}-devel
 %endif
 %endif
 
@@ -321,10 +328,10 @@ data, and of arbitrary input size.
 %package mpi-devel
 Summary:        Discrete Fourier Transform (DFT) C subroutine library
 Group:          Development/Libraries/C and C++
+Requires:       %{mpi_implem}-devel
 Requires:       fftw3-devel = %{version}
 Requires:       glibc-devel
 Requires:       libfftw3_mpi3 = %{version}-%{release}
-Requires:       openmpi-devel
 
 %description mpi-devel
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -350,7 +357,7 @@ EOF
 %endif
 %ifnarch s390 s390x
 %if "%{mpi_flavor}" == "standard"
-source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
+source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
 %endif
 %endif
 
@@ -390,7 +397,7 @@ make distclean
 
 %ifnarch s390 s390x
 %if "%{mpi_flavor}" == "standard"
-source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
+source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
 %endif
 %endif
 
@@ -418,7 +425,7 @@ make distclean
 
 %ifnarch s390 s390x
 %if "%{mpi_flavor}" == "standard"
-source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh
+source %_libdir/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
 %endif
 %endif
 %if %{without hpc}