From 2a92468570eff9832c3a415ea28608e6b0a40ee1ab824f77c8e8da310f797b96 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Sun, 7 Jan 2018 21:00:47 +0000
Subject: [PATCH] Accepting request 562259 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).
- Fix unexpanded rpm macro in environment module file for HPC (boo#1074897).

OBS-URL: https://build.opensuse.org/request/show/562259
OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=61
---
 openblas.changes |  7 +++++++
 openblas.spec    | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/openblas.changes b/openblas.changes
index 6cd4310..6e5295d 100644
--- a/openblas.changes
+++ b/openblas.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan  5 18:27:17 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).
+- Fix unexpanded rpm macro in environment module file for HPC (boo#1074897).
+
 -------------------------------------------------------------------
 Mon Nov 27 11:55:04 UTC 2017 - normand@linux.vnet.ibm.com
 
diff --git a/openblas.spec b/openblas.spec
index 583d9e0..40a90d1 100644
--- a/openblas.spec
+++ b/openblas.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openblas
 #
-# 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
@@ -64,9 +64,9 @@ 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
 %{bcond_without hpc}
 %endif
 
@@ -78,9 +78,9 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu6-hpc-pthreads"
+%if "%flavor" == "gnu7-hpc-pthreads"
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %define ext pthreads
 %define build_flags USE_THREAD=1 USE_OPENMP=0
 %{bcond_without hpc}
@@ -168,7 +168,7 @@ Obsoletes:      lib%{pname}p0
 Obsoletes:      lib%{pname}o0
  %endif
 %else # with hpc
-Requires:       lua-lmod
+%hpc_requires
 %endif
 
 %description -n lib%{name}%{?so_v}
@@ -350,7 +350,7 @@ puts stderr "This module loads the %{pname} library built with the %{compiler_fa
 puts stderr "\nVersion %{version}\n"
 
 }
-module-whatis "Name: %{PNAME} built with %{compiler_family} toolchain"
+module-whatis "Name: %{hpc_upcase %pname} built with %{compiler_family} toolchain"
 module-whatis "Version: %{version}"
 module-whatis "Category: runtime library"
 module-whatis "Description: %{dep_summary}"