Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2020-07-21 15:49:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf" Tue Jul 21 15:49:21 2020 rev:56 rq:822020 version:4.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2020-07-20 21:05:33.233347358 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf.new.3592/netcdf.changes 2020-07-21 15:51:22.936368589 +0200 @@ -1,0 +2,12 @@ +Mon Jul 20 10:24:37 UTC 2020 - Egbert Eich <[email protected]> + +- Add support for OpenMPI 4 (disabled on < 15.3) + +------------------------------------------------------------------- +Mon Jul 20 10:23:26 UTC 2020 - Egbert Eich <[email protected]> + +- Remove requirements for parallel-netcdf from non-HPC builds: + without the '--enable-pnetcdf' configure option, this doesn't + make sense. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.maJywr/_old 2020-07-21 15:51:24.320370272 +0200 +++ /var/tmp/diff_new_pack.maJywr/_new 2020-07-21 15:51:24.324370277 +0200 @@ -28,8 +28,13 @@ %if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build %endif -%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 -%define DisOMPI3 ExclusiveArch: do_not_build +%if !0%{?is_opensuse} && 0%{?sle_version:1} + %if 0%{?sle_version} < 150200 + %define DisOMPI3 ExclusiveArch: do_not_build + %endif + %if 0%{?sle_version} < 150300 + %define DisOMPI4 ExclusiveArch: do_not_build + %endif %endif %if "%flavor" == "" @@ -68,6 +73,15 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%undefine c_f_ver +%define mpi_flavor openmpi +%define mpi_ver 4 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu-openmpi2-hpc" %{?DisOMPI2} %global compiler_family gnu @@ -125,6 +139,15 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu7-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%define c_f_ver 7 +%define mpi_flavor openmpi +%define mpi_ver 4 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu7-mvapich2-hpc" %global compiler_family gnu %define c_f_ver 7 @@ -173,6 +196,15 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu8-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%define c_f_ver 8 +%define mpi_flavor openmpi +%define mpi_ver 4 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu8-mvapich2-hpc" %global compiler_family gnu %define c_f_ver 8 @@ -221,6 +253,15 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu9-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%define c_f_ver 9 +%define mpi_flavor openmpi +%define mpi_ver 4 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu9-mvapich2-hpc" %global compiler_family gnu %define c_f_ver 9 @@ -261,6 +302,13 @@ %bcond_with hpc %endif +%if "%{flavor}" == "openmpi4" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define mpi_ver 4 +%bcond_with hpc +%endif + %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}} @@ -331,10 +379,6 @@ BuildRequires: libhdf5_hl%{p_suffix} %if %{with mpi} BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel -BuildRequires: parallel-netcdf%{p_suffix}-devel - %if "%{flavor}" == "openmpi1" -BuildRequires: libpnetcdf%{p_suffix} - %endif %endif %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel @@ -369,9 +413,6 @@ # To avoid unresolvable errors due to multiple providers of the library Requires: libhdf5%{p_suffix} Requires: libhdf5_hl%{p_suffix} -%if %{flavor} == "openmpi1" -%{?with_mpi:Requires: libpnetcdf%{p_suffix}} -%endif %else %{hpc_requires} Requires: libhdf5%{hpc_package_name_tail} >= 1.8.8 @@ -436,9 +477,6 @@ %if %{without hpc} Requires: hdf5%{p_suffix}-devel >= 1.8.8 %{?with_mpi:Requires: %{mpi_flavor}%{?mpi_ext}-devel} - %if "%{flavor}" == "openmpi1" -Requires: parallel-netcdf-%{mpi_flavor}%{?mpi_ext}-devel - %endif %else %{hpc_requires_devel} Requires: hdf5%{hpc_package_name_tail}-devel >= 1.8.8 ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.maJywr/_old 2020-07-21 15:51:24.352370310 +0200 +++ /var/tmp/diff_new_pack.maJywr/_new 2020-07-21 15:51:24.352370310 +0200 @@ -3,10 +3,12 @@ <package>openmpi1</package> <package>openmpi2</package> <package>openmpi3</package> + <package>openmpi4</package> <package>gnu-hpc</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package> + <package>gnu-openmpi4-hpc</package> <package>gnu-mvapich2-hpc</package> <package>gnu-mpich-hpc</package> </multibuild>
