Hello community, here is the log from the commit of package suse-hpc for openSUSE:Factory checked in at 2017-11-21 15:34:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-hpc (Old) and /work/SRC/openSUSE:Factory/.suse-hpc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-hpc" Tue Nov 21 15:34:15 2017 rev:6 rq:543983 version:0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-hpc/suse-hpc.changes 2017-10-20 14:47:17.612250889 +0200 +++ /work/SRC/openSUSE:Factory/.suse-hpc.new/suse-hpc.changes 2017-11-21 15:34:19.524963135 +0100 @@ -1,0 +2,10 @@ +Mon Nov 20 18:44:42 UTC 2017 - [email protected] + +- Add lua-lmod to the HPC base Requires +- Fix %name in %hpc_python_master_package + Not only %pname but also %name needs to have python replaced + by %python_flavor. +- Add macro to santize %pname for environment variables + This marco up-cases the name and replaces '-' by '_'. + +------------------------------------------------------------------- @@ -42 +52 @@ -- Initial version. +- Initial version (FATE#320596). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.yKYqKS/_old 2017-11-21 15:34:20.192938929 +0100 +++ /var/tmp/diff_new_pack.yKYqKS/_new 2017-11-21 15:34:20.196938784 +0100 @@ -6,7 +6,7 @@ <param name="exclude">.git</param> <param name="filename">suse-hpc</param> <param name="versionformat">0.1.%h</param> - <param name="revision">960d92268df13a0806254c325e3e72e135268c77</param> + <param name="revision">10f46e14ff638192561d1de900eef46bdd9bb2eb</param> <param name="extract">general/dlinfo.c</param> <param name="extract">general/macros.hpc</param> <param name="extract">general/hpc_elf.pl</param> ++++++ macros.hpc ++++++ --- /var/tmp/diff_new_pack.yKYqKS/_old 2017-11-21 15:34:20.264936320 +0100 +++ /var/tmp/diff_new_pack.yKYqKS/_new 2017-11-21 15:34:20.264936320 +0100 @@ -87,8 +87,9 @@ %hpc_mpi_requires_devel %{expand:%{hpc_%{hpc_mpi_family}_requires_devel}} # Base -%hpc_requires %{?hpc_compiler_family:%{!?_hpc_build_compiler:%hpc_cf_requires}}\ -%{?hpc_mpi_family:%{!?_hpc_build_mpi:%hpc_mpi_requires}} +%hpc_requires Requires: lua-lmod \ +%{?hpc_compiler_family:%{!?_hpc_build_compiler:%hpc_cf_requires}}\ +%{?hpc_mpi_family:%{!?_hpc_build_mpi:%hpc_mpi_requires}}\ # Devel %hpc_requires_devel %{?hpc_compiler_family:%{!?_hpc_build_compiler:%hpc_cf_requires_devel}}\ @@ -418,6 +419,7 @@ # Functions ## %hpc_upcase() %(echo %{**} | tr [a-z] [A-Z]) +%hpc_PNAME() %(echo %{**} | tr [a-z-] [A-Z_]) ## # Macros specific for python packages @@ -464,6 +466,7 @@ local a_arg = rpm.expand("%{?-a:-a}") \ local other_arg = rpm.expand("%{*}") \ local pname = rpm.expand("%pname") \ + local name = rpm.expand("%name") \ local python_flavor = rpm.expand("%python_flavor") \ -- io.stderr:write("n_arg "..n_arg.."\\n") \ if n_arg ~= "" then \ @@ -471,7 +474,9 @@ -- io.stderr:write("n_arg modfied "..n_arg .."\\n") \ end \ local n_pname = pname:gsub("^python", python_flavor,1) \ + local n_name = name:gsub("^python", python_flavor,1) \ rpm.define("pname "..n_pname) \ + rpm.define("name "..n_name) \ add_args (g_arg, "-g") \ add_args (n_arg, "-n") \ add_args (l_arg) \ @@ -487,6 +492,7 @@ -- skip it entirely! \ if _hpc_python_package_list[package] == true then \ rpm.define("pname " .. pname) \ + rpm.define("name " .. name) \ return \ else \ _hpc_python_package_list[package] = true \ @@ -497,6 +503,7 @@ io.stderr:write("%{hpc_master_package " .. arg_list .. "}\\n\\n") \ print(rpm.expand("%{hpc_master_package " .. arg_list .. "}") .."\\n") \ rpm.define("pname " .. pname) \ + rpm.define("name " .. name) \ -- io.stderr:write("pname "..rpm.expand("%pname").."\\n\\n") \ }
