From b71e2ca2302ea567d3916709651b690e85eaffbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 24 Aug 2019 20:05:14 +0200
Subject: [PATCH] Update to 3.3.1

---
 .gitignore                      |  1 +
 0003-soften-version-check.patch | 13 -------------
 mpich.spec                      | 13 +++++++++----
 sources                         |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 0003-soften-version-check.patch

diff --git a/.gitignore b/.gitignore
index 2941101..e4b3e70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mpich-3.2.tar.gz
 /mpich-3.2.1.tar.gz
 /mpich-3.1.1.tar.gz
+/mpich-3.3.1.tar.gz
diff --git a/0003-soften-version-check.patch b/0003-soften-version-check.patch
deleted file mode 100644
index 6d75cc6..0000000
--- a/0003-soften-version-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git mpich-3.2/./src/binding/cxx/mpicxx.h.in~ mpich-3.2/./src/binding/cxx/mpicxx.h.in
-index 375c081e0e..24f1d6c2cc 100644
---- mpich-3.2/./src/binding/cxx/mpicxx.h.in~
-+++ mpich-3.2/./src/binding/cxx/mpicxx.h.in
-@@ -17,7 +17,7 @@
- // between 3.2.3 and 3.4.3 (!!)  Normally such changes
- // should only occur at major releases (e.g., version 3 to 4)
- #ifdef __GNUC__ 
--# if __GNUC__ >= @GNUCXX_VERSION@ 
-+# if __GNUC__ >= @GNUCXX_VERSION@ && @GNUCXX_VERSION@ == 3
- #  if __GNUC_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2 
- #  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
- #  endif
diff --git a/mpich.spec b/mpich.spec
index 8ae9846..9d0f7d7 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,7 +1,7 @@
 Summary:        A high-performance implementation of MPI
 Name:           mpich
-Version:        3.2.1
-Release:        14%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 License:        MIT
 URL:            http://www.mpich.org/
 
@@ -10,12 +10,11 @@ Source1:        mpich.macros
 Source2:        mpich.pth.py2
 Source3:        mpich.pth.py3
 Patch0:         mpich-modules.patch
-Patch3:         0003-soften-version-check.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-gfortran
-BuildRequires:  hwloc-devel >= 1.8
+BuildRequires:  hwloc-devel >= 2.0
 %ifnarch s390 %{mips}
 BuildRequires:  valgrind-devel
 %endif
@@ -136,6 +135,9 @@ sed -r -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 #Try and work around 'unused-direct-shlib-dependency' rpmlint warnning
 sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
 
+# work-around libtool error: cannot determine absolute directory name of 'system/lib'
+mkdir -p system/lib
+
 %make_build VERBOSE=1
 
 %install
@@ -231,6 +233,9 @@ make check VERBOSE=1 \
 %{python3_sitearch}/%{name}.pth
 
 %changelog
+* Wed Aug 28 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.1-1
+- Really upgrade to 3.3.1 (#1745252)
+
 * Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-1
 - "Upgrade" back to 3.2.1 (#1745252)
   (I made a typo, and instead of *upgrading* to 3.3.1, I made a downgrade
diff --git a/sources b/sources
index ecf8934..20fe7b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mpich-3.2.1.tar.gz) = 659a11cf02302f27eb1db77667dd4c7a4f8008b1d73f5f0f0f28ee6b5d9cca2130bac3d010a132136ba15a25a738ec9cbda67255133aeb42f0d82a2ded23d23d
+SHA512 (mpich-3.3.1.tar.gz) = 3d518d10324f259f4ddf87b7b20b5daae4d60e5f76e7ca1d06afd289beaa489b4f75f023466bd6610f615ebbd8c3cf2e241738e0f7b8c0d2c57235edbf805c39