Accepting request 1083905 from home:eeich:branches:science:HPC

- Do not redefine _localstatedir and _sharedstatedir for cmake:
  hpc_localstatedir and hpc_sharedstatedir are already the
  same. This may lead to a endless recursive definition loop.
- Create header magic for module file if none is specified in
  spec file.

OBS-URL: https://build.opensuse.org/request/show/1083905
OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=62

_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">fd76646f99470213a4cfe6c5c11fa1068a0f5e61</param>
+    <param name="revision">968c9cb1cc13f668529623cda4ec25af1495c7e0</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

@@ -257,8 +257,9 @@ EOF\
 %{?hpc_make_modules_extra} \
 %{?_hpc_build_xx:mkdir -p %{buildroot}%{hpc_module_dep_install}} \
 %hpc_write_modules_version_file \
-echo "Writing %{buildroot}%{hpc_module_dep_base}%{version}" \
+echo "Writing %{buildroot}%{hpc_module_dep_base}%{version}"; \
-cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
+sed -e '/#%%Module1.0.*/b 1;1s/\(.*\)/#%%Module1.0\n\1/;:1' << EOF\\\
+  > %{buildroot}%{hpc_module_dep_base}%{version}
 
 %hpc_modulepath %{?_hpc_build_xx:%{hpc_module_dep_install}}%{!?_hpc_build_xx:%{hpc_module_dep_path}}
 
@@ -740,11 +741,9 @@ sys.exit(0)" %{1}
     %define _infodir %{hpc_infodir} \
     %define _libdir %{hpc_libdir} \
     %define _libexecdir %{hpc_libexecdir} \
-    %define _localstatedir %{hpc_localstatedir} \
     %define _mandir %{hpc_mandir} \
     %define _prefix %{hpc_prefix} \
     %define _sbindir %{hpc_sbindir} \
-    %define _sharedstatedir %{hpc_sharedstatedir} \
 #Do NOT define _sysconfig to %%hpc_sysconfig here!
     %cmake \\\
     %undefine __cmake \\\
@@ -754,11 +753,9 @@ sys.exit(0)" %{1}
     %undefine _infodir \\\
     %undefine _libdir \\\
     %undefine _libexecdir \\\
-    %undefine _localstatedir \\\
     %undefine _mandir \\\
     %undefine _prefix \\\
     %undefine _sbindir \\\
-    %undefine _sharedstatedir \\\
  }
 
 # wraps macro from macros.meson - paths replaced by HPC paths.

suse-hpc.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon May  1 07:43:38 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Do not redefine _localstatedir and _sharedstatedir for cmake:
+  hpc_localstatedir and hpc_sharedstatedir are already the
+  same. This may lead to a endless recursive definition loop.
+- Create header magic for module file if none is specified in
+  spec file.
+
 -------------------------------------------------------------------
 Wed May 25 05:56:07 UTC 2022 - Egbert Eich <eich@suse.com>
 

suse-hpc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package suse-hpc
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Summary:        SUSE HPC Environment
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 Name:           suse-hpc
-Version:        0.5.20220525.fd76646
+Version:        0.5.20230501.968c9cb
 Release:        0
 Source0:        macros.hpc
 Source1:        dlinfo.c