diff --git a/hdf5.changes b/hdf5.changes index b6bf070..c1a67ad 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 11 12:15:14 UTC 2018 - eich@suse.com + +- Create main master package, fix dependencies. + ------------------------------------------------------------------- Fri Sep 21 14:50:12 UTC 2018 - Stefan BrĂ¼ns diff --git a/hdf5.spec b/hdf5.spec index 3379613..787e3c6 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -241,6 +241,12 @@ Requires: lib%{pname}_hl%{sonum_HL} = %{version} Requires: lib%{pname}hl_fortran%{sonum_HL_F} = %{version} %else # hpc %hpc_requires +Requires: %{libname -l _cpp} +Requires: %{libname -l _fortran} +Requires: %{libname -l _hl_cpp} +Requires: %{libname -l _hl} +Requires: %{libname -l hl_fortran} +Requires: %{libname} BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: lua-lmod BuildRequires: suse-hpc >= 0.2 @@ -254,16 +260,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build HDF5 is a data model, library, and file format for storing and managing data. It supports an unlimited variety of datatypes. -This package contains the %{flavor} version utility functions for working +This package contains the %{flavor} version utility functions for working with HDF5 files. +%{?with_hpc:%{hpc_master_package}} + %package -n %{libname -s %{sonum}} Summary: Shared libraries for the HDF5 scientific data format # To avoid unresolvable errors due to multiple providers of the library Group: System/Libraries Provides: %{libname} = %{version} Obsoletes: %{libname} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -s %{sonum}} @@ -280,7 +287,6 @@ Summary: High-level shared libraries for the HDF5 scientific data format Group: System/Libraries Provides: %{libname -l _hl} = %{version} Obsoletes: %{libname -l _hl} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -l _hl -s %{sonum_HL}} @@ -298,7 +304,6 @@ Summary: Shared libraries for the HDF5 scientific data format Group: System/Libraries Provides: %{libname -l _cpp} = %{version} Obsoletes: %{libname -l _cpp} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -l _cpp -s %{sonum_CXX}} @@ -315,7 +320,6 @@ Summary: High-level shared libraries for the HDF5 scientific data format Group: System/Libraries Provides: %{libname -l _hl_cpp} = %{version} Obsoletes: %{libname -l _hl_cpp} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} @@ -332,7 +336,6 @@ Summary: Shared libraries for the HDF5 scientific data format Group: System/Libraries Provides: %{libname -l _fortran} = %{version} Obsoletes: %{libname -l _fortran} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -l _fortran -s %{sonum_F}} @@ -349,7 +352,6 @@ Summary: High-level shared libraries for the HDF5 scientific data format Group: System/Libraries Provides: %{libname -l hl_fortran} = %{version} Obsoletes: %{libname -l hl_fortran} < %{version} -%{?with_hpc:Provides: libhdf5%{?with_mpi:-%{mpi_flavor}}-hpc = %{version}} %{?with_hpc:Requires: %{name}-module = %version} %description -n %{libname -l hl_fortran -s %{sonum_HL_F}} @@ -428,6 +430,7 @@ This package provides examples of HDF5 library use. Summary: Module files for %{name} Group: Development/Libraries/Parallel Provides: %{name}-module = %version +Requires: lua-lmod %description module HDF5 is a data model, library, and file format for storing and