diff --git a/macros.hpc b/macros.hpc index 1130efb..8ca376e 100644 --- a/macros.hpc +++ b/macros.hpc @@ -403,7 +403,7 @@ Obsoletes: %_lname < %version \ Requires: %{s_name} = %version \ %{!-l:%{!-s:%{!-a:BuildArch: noarch}}} \ %description -n %_lname \ -The package %{l_name} provides the dependency to get binary package %{s_name} \ +The package %{_lname} provides the dependency to get binary package %{s_name} \ When this package gets updated it installs the latest version of %name. \ %{-L:%post -n %_lname \ ln -sf %{hpc_module_dep_base}.version.%{version} %{hpc_module_dep_base}.version} \ @@ -634,3 +634,19 @@ sys.exit(0)" %{1} done; \ done +# wraps macro from macros.cmake - paths replaced by HPC paths. +%hpc_cmake \ + %{!?cmake:%{error: please include macros.cmake}} \ + %{?cmake: \ + %global __cmake %{_bindir}/cmake \ + %define _prefix %{hpc_prefix} \ + %define _includedir %{hpc_includedir} \ + %define _libdir %{hpc_libdir} \ + %define _datadir %{hpc_datadir} \ + %cmake \\\ + %undefine __cmake \\\ + %undefine _prefix \\\ + %undefine _includedir \\\ + %undefine _libdir \\\ + %undefine _datadir \\\ + } diff --git a/suse-hpc.changes b/suse-hpc.changes index 5ca6ee6..8d87b44 100644 --- a/suse-hpc.changes +++ b/suse-hpc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Oct 26 10:49:00 UTC 2018 - eich@suse.com + +- Add %%hpc_cmake which wraps %%cmake from marcos.cmake. + +------------------------------------------------------------------- +Thu Oct 25 10:51:17 UTC 2018 - eich@suse.com + +- macros: fix unexpanded macro in description of master package. + ------------------------------------------------------------------- Sun Aug 19 12:54:39 UTC 2018 - eich@suse.com diff --git a/suse-hpc.spec b/suse-hpc.spec index 025df36..d50362c 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.2 +Version: 0.3 Release: 0 Source0: macros.hpc Source1: dlinfo.c