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
This commit is contained in:
Egbert Eich 2021-01-18 21:03:22 +00:00 committed by Git OBS Bridge
parent a613aeea4c
commit b31989adac
4 changed files with 10 additions and 5 deletions

View File

@ -6,7 +6,7 @@
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="filename">suse-hpc</param> <param name="filename">suse-hpc</param>
<param name="versionformat">0.4.%h</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/dlinfo.c</param>
<param name="extract">general/macros.hpc</param> <param name="extract">general/macros.hpc</param>
<param name="extract">general/hpc_elf.pl</param> <param name="extract">general/hpc_elf.pl</param>

View File

@ -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 # get the python version specific directory for arch specific files in the HPC
# directory structure (singlepsec). # 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) # 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]);") %_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). # 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]} # %{hpc_python_master_package [-n <package_name>] [-g <group>] [-l][-L][-a]}
# (singlespec) # (singlespec)

View File

@ -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> Thu Jul 23 17:42:34 UTC 2020 - Egbert Eich <eich@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package suse-hpc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed