Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2018-01-16 09:33:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf" Tue Jan 16 09:33:55 2018 rev:39 rq:563901 version:4.4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2017-11-14 14:45:52.904948615 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2018-01-16 09:33:58.461266728 +0100 @@ -1,0 +2,11 @@ +Fri Jan 12 15:42:04 UTC 2018 - [email protected] + +- Disable the openmpi3 flavor in some products. + +------------------------------------------------------------------- +Fri Jan 5 19:11:19 UTC 2018 - [email protected] + +- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES. +- Add support for mpich and openmpi3 for HPC. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.WKFw2c/_old 2018-01-16 09:34:00.045192619 +0100 +++ /var/tmp/diff_new_pack.WKFw2c/_new 2018-01-16 09:34:00.049192432 +0100 @@ -1,7 +1,7 @@ # # spec file for package netcdf # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,12 @@ %bcond_with ringdisabled +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" %define package_name %{pname} ExclusiveArch: do_not_build @@ -51,6 +57,7 @@ %endif %if "%{flavor}" == "gnu-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %undefine c_f_ver %define mpi_flavor openmpi @@ -58,6 +65,15 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%undefine c_f_ver +%define mpi_flavor openmpi +%define mpi_ver 3 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu-mvapich2-hpc" %global compiler_family gnu %undefine c_f_ver @@ -65,28 +81,52 @@ %bcond_without hpc %endif -%if "%{flavor}" == "gnu6-hpc" +%if "%{flavor}" == "gnu-mpich-hpc" +%global compiler_family gnu +%undefine c_f_ver +%define mpi_flavor mpich +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu7-hpc" %global compiler_family gnu -%define c_f_ver 6 +%define c_f_ver 7 %undefine mpi_flavor %bcond_without hpc %endif -%if "%{flavor}" == "gnu6-openmpi-hpc" +%if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu -%define c_f_ver 6 +%define c_f_ver 7 %define mpi_flavor openmpi %define mpi_ver 1 %bcond_without hpc %endif -%if "%{flavor}" == "gnu6-mvapich2-hpc" +%if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu -%define c_f_ver 6 +%define c_f_ver 7 +%define mpi_flavor openmpi +%define mpi_ver 3 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu7-mvapich2-hpc" +%global compiler_family gnu +%define c_f_ver 7 %define mpi_flavor mvapich2 %bcond_without hpc %endif +%if "%{flavor}" == "gnu7-mpich-hpc" +%global compiler_family gnu +%define c_f_ver 7 +%define mpi_flavor mpich +%bcond_without hpc +%endif + %if "%{flavor}" == "mvapich2" %define mpi_flavor mvapich2 %bcond_with hpc ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.WKFw2c/_old 2018-01-16 09:34:00.081190935 +0100 +++ /var/tmp/diff_new_pack.WKFw2c/_new 2018-01-16 09:34:00.081190935 +0100 @@ -3,5 +3,7 @@ <package>openmpi</package> <package>gnu-hpc</package> <package>gnu-openmpi-hpc</package> + <package>gnu-openmpi3-hpc</package> <package>gnu-mvapich2-hpc</package> + <package>gnu-mpich-hpc</package> </multibuild>
