From 2b3527b644d47c855c36f3ad3b999b8811761fe5ca46d9a6546f6c1c6b928f29 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Mon, 13 Jan 2020 14:09:06 +0000
Subject: [PATCH] Accepting request 763902 from
 home:mslacken:branches:devel:libraries:c_c++

- removed hpc bjam package (boo#1160621)
- added gnu-hpc-openmpi3 and mpich flavor (boo#1160622)

OBS-URL: https://build.opensuse.org/request/show/763902
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=247
---
 _multibuild   |  2 ++
 boost.changes |  6 ++++++
 boost.spec    | 57 ++++++++++++++++++++++++++++++++++-----------------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/_multibuild b/_multibuild
index adbf813..94c9957 100644
--- a/_multibuild
+++ b/_multibuild
@@ -3,5 +3,7 @@
   <package>extra</package>
   <package>gnu-hpc</package>
   <package>gnu-openmpi2-hpc</package>
+  <package>gnu-openmpi3-hpc</package>
   <package>gnu-mvapich2-hpc</package>
+  <package>gnu-mpich-hpc</package>
 </multibuild>
diff --git a/boost.changes b/boost.changes
index f32537f..40e66c0 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 13 10:42:07 UTC 2020 - Christian Goll <cgoll@suse.com>
+
+- removed hpc bjam package (boo#1160621)
+- added gnu-hpc-openmpi3 and mpich flavor (boo#1160622)
+
 -------------------------------------------------------------------
 Fri Dec 13 04:03:05 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/boost.spec b/boost.spec
index ea755fd..877dbec 100644
--- a/boost.spec
+++ b/boost.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package boost
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -94,6 +94,24 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
 %endif
 %endif
 
+%if "@BUILD_FLAVOR@" == "gnu-openmpi3-hpc"
+%define build_base 0
+%define name_suffix openmpi3_hpc
+%define mpi_vers 3
+%define compiler_family gnu
+%define mpi_flavor openmpi
+%undefine c_f_ver
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python2
+%bcond_without python3
+%if %{with ringdisabled}
+ExclusiveArch:  do-not-build
+%else
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+%endif
+%endif
+
 %if "@BUILD_FLAVOR@" == "gnu-mvapich2-hpc"
 %define build_base 0
 %define name_suffix mvapich2_hpc
@@ -111,6 +129,23 @@ ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
 %endif
 %endif
 
+%if "@BUILD_FLAVOR@" == "gnu-mpich-hpc"
+%define build_base 0
+%define name_suffix mpich
+%define compiler_family gnu
+%define mpi_flavor mpich
+%undefine c_f_ver
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python2
+%bcond_without python3
+%if %{with ringdisabled}
+ExclusiveArch:  do-not-build
+%else
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+%endif
+%endif
+
 # Python NumPy library is only available on Leap 42.1 OpenSUSE onward
 # and is not availble in SLE
 %if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
@@ -327,19 +362,6 @@ applications that use the Boost C++ libraries. For documentation see
 the documentation packages (html, man or pdf).
 
 %if %{with hpc}
-%if ! %{with mpi}
-%package     -n %{package_name}-jam
-Summary:        A Boost Make Replacement
-Group:          Development/Tools/Building
-Provides:       hpc-boost-jam-impl = %{version}
-
-%description -n %{package_name}-jam
-Boost Jam is a build tool based on FTJam, which in turn is based on
-Perforce Jam. It contains significant improvements made to facilitate
-its use in the Boost Build System. This version is modularized so it 
-does not conflict with other versions, but the module must be used 
-before usage.
-%endif # ! mpi
 %package     -n %{package_name}-python3
 Summary:        Boost.MPI Python 3.x serialization library
 Group:          System/Libraries
@@ -1516,8 +1538,10 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{package_bindir}/quickbook
 
 %if %{build_base}
 mkdir -p %{buildroot}%{package_bindir}
+%if %{without hpc}
 install -m 755 b2 %{buildroot}%{package_bindir}/bjam
 ln -s bjam %{buildroot}%{package_bindir}/jam
+%endif
 
 # Remove exception library, but only if the symbols are not
 # actually used. For now, the only symbol that is linked is
@@ -1740,11 +1764,6 @@ EOF
 %files -n %{package_name}-devel
 %package_includedir
 %package_libdir/*.so
-# do not package jam/bjam when building with mpi
-%if ! %{with mpi}
-%files -n %{package_name}-jam
-%package_bindir
-%endif # ! with mpi
 %if %{with python2}
 %files -n %{package_name}-python2 
 %package_python2_sitearch