Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2019-12-03 12:41:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf" Tue Dec 3 12:41:44 2019 rev:51 rq:752863 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2019-12-02 11:31:08.522565657 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf.new.4691/netcdf.changes 2019-12-03 12:42:07.154137134 +0100 @@ -1,0 +2,9 @@ +Sat Nov 30 14:21:21 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix openmpi naming for Leap 15.x +- Correct some conditionals, matching for "openmpi" instead of + "openmpi1". +- Add non-HPC openmpi3 build flavor +- Some spec file cleanup (trailing whitespace). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.qAGYrH/_old 2019-12-03 12:42:07.810136952 +0100 +++ /var/tmp/diff_new_pack.qAGYrH/_new 2019-12-03 12:42:07.814136951 +0100 @@ -1,7 +1,7 @@ # # spec file for package netcdf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -269,8 +269,10 @@ %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}} -# For compatibility package names +# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 +%if 0%{?suse_version} >= 1550 || "%{mpi_flavor}" != "openmpi" || "%{mpi_ver}" != "1" %define mpi_ext %{?mpi_ver} +%endif %if %{with hpc} %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m {%mpi_flavor}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} @@ -334,9 +336,9 @@ BuildRequires: libhdf5_hl%{p_suffix} %if %{with mpi} BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel - %if "%{flavor}" == "openmpi" -BuildRequires: libpnetcdf%{p_suffix} BuildRequires: parallel-netcdf%{p_suffix}-devel + %if "%{flavor}" == "openmpi1" +BuildRequires: libpnetcdf%{p_suffix} %endif %endif %else @@ -366,13 +368,13 @@ Provides: %{libname}-4 = %{version} Obsoletes: %{libname}-4 < %{version} %endif -# To avoid unresolvable errors due to multiple providers of the library %{!?with_hpc:Provides: %{libname} = %{version}} Obsoletes: %{libname} < %{version} %if %{without hpc} +# To avoid unresolvable errors due to multiple providers of the library Requires: libhdf5%{p_suffix} Requires: libhdf5_hl%{p_suffix} -%if %{flavor} == "openmpi" +%if %{flavor} == "openmpi1" %{?with_mpi:Requires: libpnetcdf%{p_suffix}} %endif %else ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.qAGYrH/_old 2019-12-03 12:42:07.834136946 +0100 +++ /var/tmp/diff_new_pack.qAGYrH/_new 2019-12-03 12:42:07.834136946 +0100 @@ -2,6 +2,7 @@ <package>serial</package> <package>openmpi1</package> <package>openmpi2</package> + <package>openmpi3</package> <package>gnu-hpc</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package>
