From 5d47c0a7fe9611dadfd30055c77c85b29a645f6ee4e354bb721fd1f623014e36 Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Mon, 8 Jan 2018 09:46:26 +0000
Subject: [PATCH] Accepting request 562252 from
 home:eeich:branches:fix-compilers-hpc

- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
- Fix library package requires - use HPC macro (boo#1074890).

OBS-URL: https://build.opensuse.org/request/show/562252
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=27
---
 mvapich2.changes |  6 ++++++
 mvapich2.spec    | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/mvapich2.changes b/mvapich2.changes
index 83f1aff..355e2ba 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  5 19:03:44 UTC 2018 - eich@suse.com
+
+- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
+- Fix library package requires - use HPC macro (boo#1074890).
+
 -------------------------------------------------------------------
 Fri Oct  6 14:06:37 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 364d5bd..b415202 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mvapich2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -85,30 +85,30 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc"
+%if "%flavor" == "gnu7-hpc"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor verbs
 %{bcond_without hpc}
 %endif
-%if "%flavor" == "gnu6-hpc-testsuite"
+%if "%flavor" == "gnu7-hpc-testsuite"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define testsuite 1
 %define build_flavor verbs
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc-psm"
+%if "%flavor" == "gnu7-hpc-psm"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor psm
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc-psm2"
+%if "%flavor" == "gnu7-hpc-psm2"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define build_flavor psm2
 %{bcond_without hpc}
 %endif
@@ -202,7 +202,7 @@ BuildRequires:  libibmad-devel
 %if %{without hpc}
 Requires:       mpi-selector
 %else
-Requires:       lua-lmod
+%hpc_requires
 %endif
 
 %description