From 81871d8888683e70a2c808b746763343c2bc2ba150d73316e69acedb73314d61 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 7 Feb 2022 12:58:47 +0000
Subject: [PATCH] Accepting request 952120 from home:eeich:branches:science:HPC

- Add %hpc_python_sitelib and %hpc_python_sitelib_no_singlespec
  to get arch independent module directories for modules.

OBS-URL: https://build.opensuse.org/request/show/952120
OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=59
---
 _service         | 2 +-
 macros.hpc       | 8 ++++++--
 suse-hpc.changes | 6 ++++++
 suse-hpc.spec    | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/_service b/_service
index 1375197..afbf49f 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">07cc46c5ab791219e5971581868fd20b7d661d32</param>
+    <param name="revision">0c6b168b267e48970943805a1fcf2bc2fe7bd7b0</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 c24f3c5..c53247b 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -493,10 +493,14 @@ When this package gets updated it installs the latest version of %name. \
 
 # get the python version specific directory for arch specific files in the HPC
 # directory structure (singlepsec).
+# python_sitearch equivalent - for arch specific python modules
 %hpc_python_sitearch %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} platlib %{?hpc_prefix}}
+# python_sitelib equivalent - for arch independent python modules
+%hpc_python_sitelib %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} purelib %{?hpc_prefix}}
 
 # same for non-singlespec (using internal %%_hpc_python3)
 %hpc_python_sitearch_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} platlib %{?hpc_prefix}}
+%hpc_python_sitelib_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} purelib %{?hpc_prefix}}
 
 %_hpc_python_ver() %(%1 -c "import sysconfig as s; print(s.get_config_var('py_version_short'));")
 
@@ -615,12 +619,12 @@ end \
      *python3) newline='#! /usr/bin/python3' ;; \
      %{!?_hpc_python3: \
      *python2) newline='#! /usr/bin/python2' ;; \
-     *python1*) %{hpc_verify_python3 $file} && \
+     *python1*) { %{hpc_verify_python3 $file}; } && \
                   newline='#! /usr/bin/python3' || : ;; \
      *python) newline='#! /usr/bin/python' ;; } \
      %{?_hpc_python3: \
      *python2|*python1*|*python) \
-        %{hpc_verify_python3 $file} && \
+        { %{hpc_verify_python3 $file}; } && \
            newline='#! /usr/bin/python3' || : ;; }\
      *perl) newline='#! /usr/bin/perl' ;; \
      *bash) newline='#! /bin/bash' ;; \
diff --git a/suse-hpc.changes b/suse-hpc.changes
index e41943a..0c813a9 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Feb  6 15:55:41 UTC 2022 - Egbert Eich <eich@suse.com>
+
+- Add %hpc_python_sitelib and %hpc_python_sitelib_no_singlespec
+  to get arch independent module directories for modules.
+
 -------------------------------------------------------------------
 Wed Jan  5 16:00:53 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/suse-hpc.spec b/suse-hpc.spec
index 06981e3..c3c05ea 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.20211210.07cc46c
+Version:        0.5.20220206.0c6b168
 Release:        0
 Source0:        macros.hpc
 Source1:        dlinfo.c