From 1e5bc60e9b4337435b0f1802b03646781a7f8175 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Tue, 25 Oct 2016 15:05:57 +0200
Subject: [PATCH] Fix s390x builds

---
 petsc.spec | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/petsc.spec b/petsc.spec
index 8e91df8..ccca64e 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -4,7 +4,7 @@
 # Testing ?
 %bcond_without check
 
-## Debug builds
+## Debug builds ?
 %bcond_with debug
 #
 
@@ -13,10 +13,6 @@
 %{?el7:%global _pkgdocdir %{_docdir}/%{name}}
 #
 
-# No MPI support on these arches
-%ifnarch s390 s390x
-%bcond_without openmpi
-%endif
 # No MPICH support on these arches
 %if 0%{?rhel} || 0%{?rhel} < 7
 %ifarch %{power64}
@@ -31,6 +27,13 @@
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %bcond_without mpich
 %endif
+%ifarch s390x
+%if 0%{?fedora} >= 25
+%bcond_without openmpi
+%else
+%bcond_with openmpi
+%endif
+%endif
 
 # We are using blas/lapack on s390x architectures only
 # since openblas is not provided
@@ -71,9 +74,14 @@
 %if %{with openmpi}
 %bcond_without mpi
 %bcond_without sundials
+%ifarch s390x
+%bcond_with scalapack
+%bcond_with mumps
+%else
 %bcond_without scalapack
-%bcond_without ptscotch
 %bcond_without mumps
+%endif
+%bcond_without ptscotch
 %bcond_without hypre
 
 %global _incmpidir %{_includedir}/openmpi-%{_arch}
@@ -83,9 +91,14 @@
 %if %{with mpich}
 %bcond_without mpi
 %bcond_without sundials
+%ifarch s390x
+%bcond_with scalapack
+%bcond_with mumps
+%else
 %bcond_without scalapack
-%bcond_without ptscotch
 %bcond_without mumps
+%endif
+%bcond_without ptscotch
 %bcond_without hypre
 
 %global _incmpichdir %{_includedir}/mpich-%{_arch}
@@ -115,7 +128,7 @@
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -870,6 +883,9 @@ make -C buildmpich_dir test
 %endif
 
 %changelog
+* Tue Oct 25 2016 Antonio Trande <sagitter@fedoraproject.org> - 3.7.4-10
+- Fix s390 builds
+
 * Mon Oct 24 2016 Antonio Trande <sagitter@fedoraproject.org> - 3.7.4-9
 - Build 64bit-int libs (bz#1382916)