Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2019-11-01 15:13:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf" Fri Nov 1 15:13:42 2019 rev:49 rq:743898 version:4.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2019-10-02 11:57:37.075228182 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf.new.2990/netcdf.changes 2019-11-01 15:13:45.100724823 +0100 @@ -1,0 +2,10 @@ +Thu Oct 24 06:32:32 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- openmpi has been renamed to openmpi1 + +------------------------------------------------------------------- +Wed Oct 23 21:20:43 UTC 2019 - Egbert Eich <[email protected]> + +- Fix package description: Use macro to generate the correct information. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.BlJD1C/_old 2019-11-01 15:13:45.848725798 +0100 +++ /var/tmp/diff_new_pack.BlJD1C/_new 2019-11-01 15:13:45.852725804 +0100 @@ -134,7 +134,7 @@ %bcond_with hpc %endif -%if "%{flavor}" == "openmpi" +%if "%{flavor}" == "openmpi1" %{?DisOMPI1} %define mpi_flavor openmpi %define mpi_ver 1 @@ -164,9 +164,7 @@ %{?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}}} @@ -198,6 +196,12 @@ %define p_suffix %{?with_mpi:-%{mpi_flavor}%{?mpi_ext}} %define hdf5_module_file %{?with_mpi:p}hdf5 +%define purpose_compiler %{?nil:%{!?with_hpc:.} +%{?with_hpc:built for the %{compiler_family} compiler%{?c_f_ver: version %c_f_ver}.} +} + +%define purpose() This package contains %{?with_mpi:the %{mpi_flavor}%{?mpi_ver} version of }%{**}%{purpose_compiler} + Name: %{package_name} Summary: Command-line programs for the NetCDF scientific data format License: NetCDF @@ -245,12 +249,7 @@ machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. -%if %{without mpi} -This package contains utility functions for working with NetCDF files. -%else -This package contains the %{mpi_flavor}%{?mpi_ver} version of utility functions for -working with NetCDF files. -%endif +%{purpose utility functions for working with NetCDF files} %{?with_hpc:%{hpc_master_package}} @@ -305,12 +304,7 @@ - Sharable: One writer and multiple readers may simultaneously access the same NetCDF file. -%if %{without mpi} -This package contains the NetCDF runtime libraries. -%else -This package contains the %{mpi_flavor}%{?mpi_ver} versuib if the NetCDF runtime -libraries. -%endif +%{purpose the NetCDF runtime libraries} %{?with_hpc:%{hpc_master_package -L -l}} @@ -339,7 +333,7 @@ %if %{without hpc} Requires: hdf5%{p_suffix}-devel >= 1.8.8 %{?with_mpi:Requires: %{mpi_flavor}%{?mpi_ext}-devel} - %if "%{flavor}" == "openmpi" + %if "%{flavor}" == "openmpi1" Requires: parallel-netcdf-%{mpi_flavor}%{?mpi_ext}-devel %endif %else @@ -352,12 +346,7 @@ machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. -%if %{with mpi} -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}%{?mpi_ver} version of NetCDF. -%endif +%{purpose all files needed to create projects that use NetCDF} %{?with_hpc:%{hpc_master_package devel}} @@ -377,12 +366,7 @@ machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. -%if %{without mpi} -This package contains the static libraries for NetCDF. -%else -This package contains the %{mpi_flavor}%{?mpi_ver} versions of the static libraries -for NetCDF. -%endif +%{purpose the static libraries for NetCDF} %prep %{?with_hpc:%hpc_debug} ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.BlJD1C/_old 2019-11-01 15:13:45.896725861 +0100 +++ /var/tmp/diff_new_pack.BlJD1C/_new 2019-11-01 15:13:45.896725861 +0100 @@ -1,6 +1,6 @@ <multibuild> <package>serial</package> - <package>openmpi</package> + <package>openmpi1</package> <package>openmpi2</package> <package>gnu-hpc</package> <package>gnu-openmpi-hpc</package>
