From 1c2ba3b675f2dbecf30600a57643e8693f34913f0144f01a91ece0fc65d89211 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 14 Jun 2018 13:46:56 +0000 Subject: [PATCH 1/3] Accepting request 616878 from home:NMoreyChaisemartin:branches:science:HPC - Disable HPC builds for SLE12 (fate#323655) OBS-URL: https://build.opensuse.org/request/show/616878 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=39 --- mvapich2.changes | 5 +++++ mvapich2.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/mvapich2.changes b/mvapich2.changes index 4bdc91a..da44a3a 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 12 07:07:37 UTC 2018 - nmoreychaisemartin@suse.com + +- Disable HPC builds for SLE12 (fate#323655) + ------------------------------------------------------------------- Sun Mar 25 13:07:18 UTC 2018 - kasimir_@outlook.de diff --git a/mvapich2.spec b/mvapich2.spec index ca05681..0009e07 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -160,6 +160,10 @@ Patch1: mvapich2-pthread_yield.patch Patch2: mvapich2-arm-support.patch Url: http://mvapich.cse.ohio-state.edu/overview/mvapich2/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Disable hpc builds for SLE12 +%if 0%{?sle_version} > 120200 && 0%{?sle_version} < 150000 && %{with hpc} +ExclusiveArch: do_not_build +%endif BuildRequires: autoconf BuildRequires: autoconf BuildRequires: automake From 544aa745dafc6460872ab3f5a85f4ad0f923482305dc10d343256c1619e815c1 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 14 Jun 2018 16:00:23 +0000 Subject: [PATCH 2/3] Accepting request 616903 from home:NMoreyChaisemartin:branches:science:HPC Fix HPC disabling OBS-URL: https://build.opensuse.org/request/show/616903 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=40 --- mvapich2.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mvapich2.spec b/mvapich2.spec index 0009e07..9b5567d 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -144,6 +144,13 @@ ExclusiveArch: do_not_build %global hpc_mvapich2_pack_version %{hpc_mvapich2_dep_version} %endif +# Disable hpc builds for SLE12 +%if 0%{?sle_version} > 120200 && 0%{?sle_version} < 150000 && %{with hpc} +%{bcond_with skip_hpc_build} +%else +%{bcond_without skip_hpc_build} +%endif + Name: %{package_name} Summary: OSU MVAPICH2 MPI package License: BSD-3-Clause @@ -160,10 +167,11 @@ Patch1: mvapich2-pthread_yield.patch Patch2: mvapich2-arm-support.patch Url: http://mvapich.cse.ohio-state.edu/overview/mvapich2/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Disable hpc builds for SLE12 -%if 0%{?sle_version} > 120200 && 0%{?sle_version} < 150000 && %{with hpc} + +%if %{without skip_hpc_build} ExclusiveArch: do_not_build %endif + BuildRequires: autoconf BuildRequires: autoconf BuildRequires: automake @@ -185,11 +193,11 @@ BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod BuildRequires: suse-hpc %endif -%if "%{build_flavor}" == "psm" +%if "%{build_flavor}" == "psm" && %{with skip_hpc_build} ExclusiveArch: %ix86 x86_64 BuildRequires: infinipath-psm-devel %endif -%if "%{build_flavor}" == "psm2" +%if "%{build_flavor}" == "psm2" && %{with skip_hpc_build} ExclusiveArch: x86_64 BuildRequires: libpsm2-devel %endif From 42d6e7e1e71d2caaef5c086bb204feafc857ec8700abbe4e45f83d15e44c23c2 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 18 Jun 2018 13:15:19 +0000 Subject: [PATCH 3/3] Accepting request 617507 from home:NMoreyChaisemartin:branches:science:HPC - Add missing bsc and fate references to changelog OBS-URL: https://build.opensuse.org/request/show/617507 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=41 --- mvapich2.changes | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index da44a3a..b9de9d9 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 18 13:12:15 UTC 2018 - nmoreychaisemartin@suse.com + +- Add missing bsc and fate references to changelog + ------------------------------------------------------------------- Tue Jun 12 07:07:37 UTC 2018 - nmoreychaisemartin@suse.com @@ -74,7 +79,7 @@ Wed Jul 5 15:12:46 UTC 2017 - nmoreychaisemartin@suse.com Mon Jun 26 12:24:30 UTC 2017 - nmoreychaisemartin@suse.com - Change install dir to allow multiple flavor to be installed - at the same time + at the same time (bsc#934090) - Fix bsc#1045955 - Fix mvapich2-psm package to use libpsm (TrueScale) - Add mvapich2-psm2 package using libpsm2 (OmniPath) @@ -184,7 +189,7 @@ Wed Nov 23 11:00:43 CET 2016 - pth@suse.de ------------------------------------------------------------------- Tue Nov 15 14:04:50 CET 2016 - pth@suse.de -- Update to version 2.2rc1. Changes since 2.1: +- Update to version 2.2rc1 (fate#319240). Changes since 2.1: MVAPICH2 2.2rc1 (03/29/2016)