From 03de1123525e5417a1a358a1e0d42cebde08b6ec Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Wed, 22 Nov 2017 12:52:18 +0100
Subject: [PATCH] Update to 3.8.1

---
 .gitignore |  1 +
 petsc.spec | 34 +++++++++++++++++++++++-----------
 sources    |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9609c47..02c571c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /petsc-3.7.6.tar.gz
 /petsc-3.7.7.tar.gz
 /petsc-3.8.0.tar.gz
+/petsc-3.8.1.tar.gz
diff --git a/petsc.spec b/petsc.spec
index 95b9f72..cb48cd7 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -84,6 +84,7 @@
 %bcond_without mpi
 # Unexpectedly 'configure' does not recognize Sundials libraries
 # Linker fails with 'conftest'
+# PETSC is incompatible with Sundials 3.0.0
 %bcond_with sundials
 %bcond_without scalapack
 %bcond_without mumps
@@ -95,6 +96,7 @@
 %bcond_without mpi
 # Unexpectedly 'configure' does not recognize Sundials libraries
 # Linker fails with 'conftest'
+# PETSC is incompatible with Sundials 3.0.0
 %bcond_with sundials
 %bcond_without scalapack
 %bcond_without mumps
@@ -109,7 +111,7 @@
 %if 0%{?el6}
 %bcond_with arch64
 %else
-%bcond_without arch64
+%bcond_with arch64
 %endif
 %else
 %bcond_with arch64
@@ -126,8 +128,8 @@
 
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
-Version: %{releasever}.0
-Release: 5%{?dist}
+Version: %{releasever}.1
+Release: 1%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz
@@ -138,7 +140,7 @@ Patch0:  %{name}-%{releasever}-no-rpath.patch
 ## Rename library name for 64-bit integer package
 Patch1:  %{name}-lib64.patch
 
-# Diable checkopts and petscnagupgrade.py
+# Disable checkopts and petscnagupgrade.py
 Patch3:  %{name}-disable_petscnagupgrade.patch
 
 %if %{with superlu}
@@ -147,12 +149,12 @@ BuildRequires: SuperLU-devel >= 5.2.0
 %if %{with superlumt}
 BuildRequires: SuperLUMT-devel
 %endif
-%if %{with sundials}
-BuildRequires: sundials-devel
-%endif
 %if %{with mumps_serial}
 BuildRequires: MUMPS-devel
 %endif
+%if %{with sundials_serial}
+BuildRequires: sundials-devel
+%endif
 %if 0%{?with_suitesparse}
 BuildRequires: suitesparse-devel
 %endif
@@ -450,6 +452,11 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
  --with-suitesparse-include=%{_includedir}/suitesparse \
  --with-suitesparse-lib="-lumfpack -lklu -lcholmod -lamd" \
 %endif
+%if %{with sundials_serial}
+ --with-sundials=1 \
+ --with-sundials-include= \
+ --with-sundials-lib="-lsundials_nvecserial -lsundials_cvode" \
+%endif
 %if %{with superlu}
  --with-superlu=1 \
  --with-superlu-include=%{_includedir}/SuperLU \
@@ -601,8 +608,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with sundials}
  --with-sundials=1 \
- --with-sundials-include= \
- --with-sundials-lib=-lsundials_nvecparallel \
+ --with-sundials-include=$MPI_INCLUDE \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel" \
 %endif
 %if %{with superludist}
  --with-superlu_dist=1 \
@@ -712,8 +719,8 @@ CFLAGS="$CFLAGS -O3 -Wl,-z,now" CXXFLAGS="$CXXFLAGS -O3" FFLAGS="$FFLAGS -O3 -Wl
 %endif
 %if %{with sundials}
  --with-sundials=1 \
- --with-sundials-include= \
- --with-sundials-lib=-lsundials_nvecparallel \
+ --with-sundials-include=$MPI_INCLUDE \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel" \
 %endif
 %if %{with superludist}
  --with-superlu_dist=1 \
@@ -1038,6 +1045,11 @@ make -C buildmpich_dir test
 %endif
 
 %changelog
+* Wed Nov 22 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.1-1
+- Update to 3.8.1
+- Disable Sundials
+- Enable MUMPS on serial build
+
 * Mon Nov 13 2017 Antonio Trande <sagitter@fedoraproject.org> - 3.8.0-5
 - Install .mod files (bz#1212557)
 
diff --git a/sources b/sources
index f32c298..0c5d4a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (petsc-3.8.0.tar.gz) = 66d186e8facb17d29c0b690646c29903d0afe3d2f7ef89a94f406ebceeb11e265b07ab605dd8ac4bd98929b3a48475ed3179733a1117187318e50bc64473fba1
+SHA512 (petsc-3.8.1.tar.gz) = 8480265e80574434252961b788602e2667d1aede48d5c80b34719895e644767bc5bc2e09deaba5ca825f7871df801e2efbb7ec1b114183aeb9376b42b77ba74e