pool/hdf5
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 670008 from home:eeich:branches:science

Browse Source 
- 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
This commit is contained in:
Christian Goll 2019-01-30 08:56:45 +00:00 committed by Git OBS Bridge
parent e41cfcb490
commit eb9af34e2f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hdf5.changes
View File

@ -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 Mon Jan 14 08:56:39 UTC 2019 - eich@suse.com

13
hdf5.spec
View File

@ -12,15 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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} %global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?is_opensuse} || 0%{?is_backports} %if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI1
%undefine DisOMPI2
%undefine DisOMPI3 %undefine DisOMPI3
%else %else
%define DisOMPI1 ExclusiveArch: do_not_build
%undefine DisOMPI2
%define DisOMPI3 ExclusiveArch: do_not_build %define DisOMPI3 ExclusiveArch: do_not_build
%endif %endif
@ -48,16 +52,19 @@ ExclusiveArch: do_not_build
%endif %endif
%if "%{flavor}" == "openmpi" %if "%{flavor}" == "openmpi"
%{?DisOMPI1}
%global mpi_flavor %{flavor} %global mpi_flavor %{flavor}
%bcond_with hpc %bcond_with hpc
%endif %endif
%if "%{flavor}" == "openmpi2" %if "%{flavor}" == "openmpi2"
%{?DisOMPI2}
%global mpi_flavor %{flavor} %global mpi_flavor %{flavor}
%bcond_with hpc %bcond_with hpc
%endif %endif
%if "%{flavor}" == "openmpi3" %if "%{flavor}" == "openmpi3"
%{?DisOMPI3}
%global mpi_flavor %{flavor} %global mpi_flavor %{flavor}
%bcond_with hpc %bcond_with hpc
%endif %endif
@ -154,7 +161,7 @@ ExclusiveArch: do_not_build
%endif %endif
# Don't build non-HPC on SLE # 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 ExclusiveArch: do_not_build
%endif %endif
@ -397,7 +404,7 @@ Group: Development/Libraries/Parallel
Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version} Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version}
Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version} Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{pname}-devel-data = %{version} %{!?with_hpc:Requires: %{pname}-devel-data = %{version}}
%if 0%{?use_sz2} %if 0%{?use_sz2}
Requires: libsz2-devel Requires: libsz2-devel
%endif %endif