From 72aed1ad1122051932af6f3812e82e9edb667e1d054d7c8ab43230de82e7826d Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 26 May 2022 19:14:40 +0000
Subject: [PATCH] Accepting request 979120 from home:eeich:branches:science:HPC

- Add %hpc_base_dirs macro
  In contrast to %hpc_dirs which also includes the library directory
  this only provides the HPC base directories.

OBS-URL: https://build.opensuse.org/request/show/979120
OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=60
---
 _service         |  2 +-
 macros.hpc       | 10 +++++++---
 suse-hpc.changes |  7 +++++++
 suse-hpc.spec    |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/_service b/_service
index afbf49f..f03ca6b 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="exclude">.git</param>
     <param name="filename">suse-hpc</param>
     <param name="versionformat">0.5.%cd.%h</param>
-    <param name="revision">0c6b168b267e48970943805a1fcf2bc2fe7bd7b0</param>
+    <param name="revision">fd76646f99470213a4cfe6c5c11fa1068a0f5e61</param>
 	<param name="extract">general/dlinfo.c</param>
 	<param name="extract">general/macros.hpc</param>
 	<param name="extract">general/hpc_elf.pl</param>
diff --git a/macros.hpc b/macros.hpc
index c53247b..77a2e38 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -286,11 +286,15 @@ cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
 %dir %hpc_mpi_install_path_base \
 %dir %hpc_mpi_install_path
 
-# serial and parallel libraries - use in library package
-%hpc_dirs \
+# base dir path only
+%hpc_base_dirs \
 %{!?hpc_compiler_family:%dir %{hpc_install_base}} \
 %dir %{hpc_install_path_base} \
-%dir %{hpc_install_path} \
+%dir %{hpc_install_path}
+
+# serial and parallel libraries - use in library package
+%hpc_dirs \
+%{hpc_base_dirs} \
 %dir %{hpc_libdir}
 
 #
diff --git a/suse-hpc.changes b/suse-hpc.changes
index 0c813a9..0723d50 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 25 05:56:07 UTC 2022 - Egbert Eich <eich@suse.com>
+
+- Add %hpc_base_dirs macro
+  In contrast to %hpc_dirs which also includes the library directory
+  this only provides the HPC base directories.
+
 -------------------------------------------------------------------
 Sun Feb  6 15:55:41 UTC 2022 - Egbert Eich <eich@suse.com>
 
diff --git a/suse-hpc.spec b/suse-hpc.spec
index c3c05ea..b832270 100644
--- a/suse-hpc.spec
+++ b/suse-hpc.spec
@@ -20,7 +20,7 @@ Summary:        SUSE HPC Environment
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 Name:           suse-hpc
-Version:        0.5.20220206.0c6b168
+Version:        0.5.20220525.fd76646
 Release:        0
 Source0:        macros.hpc
 Source1:        dlinfo.c