Hello community,
here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2019-07-05 13:48:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf (Old)
and /work/SRC/openSUSE:Factory/.netcdf.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf"
Fri Jul 5 13:48:32 2019 rev:45 rq:674847 version:4.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2019-01-10 15:22:51.986359925 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf.new.4615/netcdf.changes 2019-07-05 13:48:33.545438590 +0200
@@ -1,0 +2,5 @@
+Wed Feb 13 11:49:57 UTC 2019 - Egbert Eich
+
+- Consolidate use of openmpi1, openmpi2, openmpi3.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf.spec ++++++
--- /var/tmp/diff_new_pack.qH2yFC/_old 2019-07-05 13:48:34.193439589 +0200
+++ /var/tmp/diff_new_pack.qH2yFC/_new 2019-07-05 13:48:34.193439589 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netcdf
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -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 http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -134,12 +134,23 @@
%endif
%if "%{flavor}" == "openmpi"
+%{?DisOMPI1}
%define mpi_flavor openmpi
+%define mpi_ver 1
%bcond_with hpc
%endif
%if "%{flavor}" == "openmpi2"
-%define mpi_flavor openmpi2
+%{?DisOMPI2}
+%define mpi_flavor openmpi
+%define mpi_ver 2
+%bcond_with hpc
+%endif
+
+%if "%{flavor}" == "openmpi3"
+%{?DisOMPI3}
+%define mpi_flavor openmpi
+%define mpi_ver 3
%bcond_with hpc
%endif
@@ -149,7 +160,12 @@
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
-%{?with_mpi:%{!?mpi_flavor:%global mpi_flavor openmpi}}
+%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
+
+# For compatibility package names
+%if "%{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}}}
@@ -171,14 +187,14 @@
%define p_mandir %_mandir
%define p_includedir %_includedir
%else
-%define p_prefix /usr/%{_lib}/mpi/gcc/%{mpi_flavor}
+%define p_prefix /usr/%{_lib}/mpi/gcc/%{mpi_flavor}%{?mpi_ext}
%define p_bindir %{p_prefix}/bin
%define p_libdir %{p_prefix}/%{_lib}
%define p_mandir %{p_prefix}/share/man
%define p_includedir %{p_prefix}/include
%endif
%endif
-%define p_suffix %{?with_mpi:-%{mpi_flavor}}
+%define p_suffix %{?with_mpi:-%{mpi_flavor}%{?mpi_ext}}
%define hdf5_module_file %{?with_mpi:p}hdf5
Name: %{package_name}
@@ -209,7 +225,7 @@
BuildRequires: hdf5%{p_suffix}-devel
BuildRequires: libhdf5_hl%{p_suffix}
%if %{with mpi}
-BuildRequires: %{mpi_flavor}-devel
+BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel
%if "%{flavor}" == "openmpi"
BuildRequires: libpnetcdf%{p_suffix}
BuildRequires: parallel-netcdf%{p_suffix}-devel
@@ -234,7 +250,7 @@
%if %{without mpi}
This package contains utility functions for working with NetCDF files.
%else
-This package contains the %{mpi_flavor} version of utility functions for
+This package contains the %{mpi_flavor}%{?mpi_ver} version of utility functions for
working with NetCDF files.
%endif
@@ -294,7 +310,7 @@
%if %{without mpi}
This package contains the NetCDF runtime libraries.
%else
-This package contains the %{mpi_flavor} versuib if the NetCDF runtime
+This package contains the %{mpi_flavor}%{?mpi_ver} versuib if the NetCDF runtime
libraries.
%endif
@@ -324,9 +340,9 @@
Requires: zlib-devel >= 1.2.5
%if %{without hpc}
Requires: hdf5%{p_suffix}-devel >= 1.8.8
-%{?with_mpi:Requires: %{mpi_flavor}-devel}
+%{?with_mpi:Requires: %{mpi_flavor}%{?mpi_ext}-devel}
%if "%{flavor}" == "openmpi"
-Requires: parallel-netcdf-%{mpi_flavor}-devel
+Requires: parallel-netcdf-%{mpi_flavor}%{?mpi_ext}-devel
%endif
%else
%{hpc_requires_devel}
@@ -342,7 +358,7 @@
This package contains all files needed to create projects that use NetCDF.
%else
This package contains all files needed to create projects that use
-the %{mpi_flavor} version of NetCDF.
+the %{mpi_flavor}%{?mpi_ver} version of NetCDF.
%endif
%{?with_hpc:%{hpc_master_package devel}}
@@ -366,7 +382,7 @@
%if %{without mpi}
This package contains the static libraries for NetCDF.
%else
-This package contains the %{mpi_flavor} versions of the static libraries
+This package contains the %{mpi_flavor}%{?mpi_ver} versions of the static libraries
for NetCDF.
%endif
@@ -392,9 +408,9 @@
%if %{without mpi}
export CC=gcc CXX=g++ FC=gfortran
%else
-export CC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpicc
-export FC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpif90
-export CXX=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/}mpic++
+export CC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpicc
+export FC=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpif90
+export CXX=%{!?with_hpc:/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/}mpic++
%endif
autoreconf -fv
export CFLAGS="-fno-strict-aliasing %{?with_hpc:-L$HDF5_LIB -I$HDF5_INC}"
@@ -452,8 +468,8 @@
%if %{without hpc}
%if %{with mpi}
# Module files
-mkdir -p %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}
-cat << EOF > %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}/%version
+mkdir -p %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}
+cat << EOF > %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}/%version
#%%Module
proc ModulesHelp { } {
global dotversion
@@ -479,7 +495,7 @@
puts stderr " "
puts stderr "This module loads the NetCDF C API built with the %{compiler_family} compiler"
-puts stderr "toolchain and the %{mpi_flavor} MPI stack."
+puts stderr "toolchain and the %{mpi_flavor}%{?mpi_ver} MPI stack."
puts stderr " "
puts stderr "Note that this build of NetCDF leverages the HDF I/O library and requires linkage"
puts stderr "against hdf5. Consequently, the phdf5 package is loaded automatically with this module."
@@ -535,7 +551,7 @@
module load %{hdf5_module_file}
%else
%if %{with mpi}
- . /usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpivars.sh
+ . /usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpivars.sh
%endif
%endif
make check
@@ -566,7 +582,7 @@
%else
%if %{with mpi}
%dir %{_datadir}/modules
-%{_datadir}/modules/%{pname}-%{mpi_flavor}
+%{_datadir}/modules/%{pname}-%{mpi_flavor}%{?mpi_ext}
%endif
%endif
%{p_libdir}/libnetcdf.so.*