From eb9af34e2fe8f7500419afcc5930263eaff1ebc7f7774dae5a5dcb65a5325ea8 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 30 Jan 2019 08:56:45 +0000 Subject: [PATCH] Accepting request 670008 from home:eeich:branches:science - Remove dependency to the hdf5-devel-data file for HPC: Currently, there are no macro files for HPC - these files will have to be handled differently. - Re-disable all non-HPC builds for SLE. OBS-URL: https://build.opensuse.org/request/show/670008 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=99 --- hdf5.changes | 8 ++++++++ hdf5.spec | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/hdf5.changes b/hdf5.changes index 8a1e141..098df9d 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 25 19:14:31 UTC 2019 - eich@suse.com + +- Remove dependency to the hdf5-devel-data file for HPC: + Currently, there are no macro files for HPC - these files + will have to be handled differently. +- Re-disable all non-HPC builds for SLE. + ------------------------------------------------------------------- Mon Jan 14 08:56:39 UTC 2019 - eich@suse.com diff --git a/hdf5.spec b/hdf5.spec index 7001ba8..6dd9be4 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -12,15 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global flavor @BUILD_FLAVOR@%{nil} %if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI1 +%undefine DisOMPI2 %undefine DisOMPI3 %else +%define DisOMPI1 ExclusiveArch: do_not_build +%undefine DisOMPI2 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -48,16 +52,19 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "openmpi" +%{?DisOMPI1} %global mpi_flavor %{flavor} %bcond_with hpc %endif %if "%{flavor}" == "openmpi2" +%{?DisOMPI2} %global mpi_flavor %{flavor} %bcond_with hpc %endif %if "%{flavor}" == "openmpi3" +%{?DisOMPI3} %global mpi_flavor %{flavor} %bcond_with hpc %endif @@ -154,7 +161,7 @@ ExclusiveArch: do_not_build %endif # Don't build non-HPC on SLE -%if !0%{?is_opensuse} && !0%{?with_hpc:1} && "%{flavor}" != "serial" +%if !0%{?is_opensuse} && !0%{?with_hpc:1} ExclusiveArch: do_not_build %endif @@ -397,7 +404,7 @@ Group: Development/Libraries/Parallel Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version} Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version} Requires: %{name} = %{version} -Requires: %{pname}-devel-data = %{version} +%{!?with_hpc:Requires: %{pname}-devel-data = %{version}} %if 0%{?use_sz2} Requires: libsz2-devel %endif