From b31989adac31b32d083e5202146596e1efc3936f936eac2eb219b03380df43ea Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 18 Jan 2021 21:03:22 +0000
Subject: [PATCH] Accepting request 864148 from home:eeich:branches:science:HPC

- Expand python_flavor to python executable. Thanks to Ben Greiner.

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

diff --git a/_service b/_service
index 68e0786..6a1b642 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="exclude">.git</param>
     <param name="filename">suse-hpc</param>
     <param name="versionformat">0.4.%h</param>
-    <param name="revision">663bf86ed7dc0d3e5526d4b7c7edaf5d04de648f</param>
+    <param name="revision">c65447a9944f342fbca39b0d339e347861098dd7</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 6a779e7..61cfc7a 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -467,15 +467,15 @@ 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).
-%hpc_python_sitearch %{_hpc_python_sysconfig_path %python_flavor platlib %{?hpc_prefix}}
+%hpc_python_sitearch %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} platlib %{?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:%python_flavor} platlib %{?hpc_prefix}}
+%hpc_python_sitearch_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} platlib %{?hpc_prefix}}
 
 %_hpc_python_ver() %(%1 -c "import sys as s;print(s.version[:3]);")
 
 # get the (abbreviated) python version used for package and directory names (singlespec).
-%hpc_python_version %{_hpc_python_ver %python_flavor}
+%hpc_python_version %{_hpc_python_ver %{expand:%__%{python_flavor}}}
 
 # %{hpc_python_master_package [-n <package_name>] [-g <group>] [-l][-L][-a]}
 # (singlespec)
diff --git a/suse-hpc.changes b/suse-hpc.changes
index 90d7ead..098eb08 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 18 17:20:57 UTC 2021 - Egbert Eich <eich@suse.com>
+
+- Expand python_flavor to python executable. Thanks to Ben Greiner.
+
 -------------------------------------------------------------------
 Thu Jul 23 17:42:34 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/suse-hpc.spec b/suse-hpc.spec
index d41cae4..a97c124 100644
--- a/suse-hpc.spec
+++ b/suse-hpc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package suse-hpc
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed