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

Accepting request 765742 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/765742
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2020-01-20 21:55:35 +00:00 committed by Git OBS Bridge
commit 9fdd07614b
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hdf5.changes
View File

@ -1,7 +1,22 @@
-------------------------------------------------------------------
Mon Jan 20 00:47:04 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Remove bogus undefines of suffix and mpi_flavor. suffix is the
name of an RPM built-in (like expand or echo), and since RPM 4.15
trying to alter a built-in is an error. Fixes built of serial
flavor on Tumbleweed. See https://rpm.org/user_doc/macros.html
-------------------------------------------------------------------
Tue Dec 10 16:30:03 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Add compat provides for renamed hdf5-openmpi{,-devel} package,
see https://en.opensuse.org/openSUSE:Package_dependencies
- Fix openmpi1 package naming for SLE/Leap <= 15.1
-------------------------------------------------------------------
Thu Nov 28 18:13:10 UTC 2019 - Egbert Eich <eich@suse.com>
- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8604).
- Add HPC support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8604).
-------------------------------------------------------------------
Thu Nov 28 15:54:19 UTC 2019 - Egbert Eich <eich@suse.com>

18
hdf5.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hdf5
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,8 +43,6 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "serial"
%undefine suffix
%undefine mpi_flavor
%bcond_with hpc
%endif
@ -275,7 +273,11 @@ ExclusiveArch: do_not_build
%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
# For compatibility package names
%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
%define mpi_ext %{nil}
%else
%define mpi_ext %{?mpi_vers}
%endif
%if %{with hpc}
%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
@ -377,6 +379,10 @@ BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macr
%endif
%endif # ?hpc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
Provides: %{pname}-openmpi = %{version}-%{release}
Obsoletes: %{pname}-openmpi < %{version}-%{release}
%endif
%description
HDF5 is a data model, library, and file format for storing and
@ -512,6 +518,10 @@ Requires: %{libname -l _fortran -s %{sonum_F}} = %{version}
Requires: %{libname -l _hl -s %{sonum_HL}} = %{version}
Requires: %{libname -l hl_fortran -s %{sonum_HL_F}} = %{version}
%{?with_hpc:%hpc_requires_devel}
%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
Provides: %{pname}-openmpi-devel = %{version}-%{release}
Obsoletes: %{pname}-openmpi-devel < %{version}-%{release}
%endif
%description devel
HDF5 is a data model, library, and file format for storing and
@ -701,9 +711,7 @@ EOF
rm -rf %{buildroot}%{_prefix}/share/hdf5_examples
%endif
%if 0%{?suse_version} >= 1110
%fdupes -s %{buildroot}/%{_datadir}
%endif
%if %{with hpc}
%{hpc_write_pkgconfig -n hdf5 -l libhdf5}