From a334d90eb97e078c1cbd2bbe5df3748177b7d70c25f6f806fe1dff63d1014313 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 27 Sep 2017 07:33:00 +0000 Subject: [PATCH] - Add %{?hpc_ext} to install path to allow multiple flavor installs OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=5 --- macros.hpc | 2 +- suse-hpc.changes | 5 +++++ suse-hpc.spec | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/macros.hpc b/macros.hpc index 5905839..41f8304 100644 --- a/macros.hpc +++ b/macros.hpc @@ -18,7 +18,7 @@ # For mpi libraries %hpc_mpi_install_base %{hpc_base}%{?hpc_cf_dir}mpi/ -%hpc_mpi_install_path_base %{hpc_mpi_install_base}%{hpc_mpi_family}/ +%hpc_mpi_install_path_base %{hpc_mpi_install_base}%{hpc_mpi_family}%{?hpc_ext}/ %hpc_mpi_install_path %{hpc_mpi_install_path_base}%{version} # Different paths - below HPC directory diff --git a/suse-hpc.changes b/suse-hpc.changes index 21f4fe4..91e4ab6 100644 --- a/suse-hpc.changes +++ b/suse-hpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 21 15:10:29 UTC 2017 - nmoreychaisemartin@suse.com + +- Add %{?hpc_ext} to install path to allow multiple flavor installs + ------------------------------------------------------------------- Wed Sep 13 19:27:49 UTC 2017 - eich@suse.com diff --git a/suse-hpc.spec b/suse-hpc.spec index f23981f..60e29eb 100644 --- a/suse-hpc.spec +++ b/suse-hpc.spec @@ -1,5 +1,5 @@ # -# spec file for package suse_hpc +# spec file for package suse-hpc # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Source2: hpc_elf.pl Source3: hpc_elf.attr Source4: hpc_elflib.attr Source5: LICENSE -Url: http://www.suse.com/hpc +Url: http://www.suse.com/hpc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,5 +57,4 @@ cp %{S:5} . %{_rpmconfigdir}/hpc_elf.pl %{_rpmconfigdir}/fileattrs/* - %changelog