Hello community, here is the log from the commit of package petsc for openSUSE:Factory checked in at 2019-11-28 13:51:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/petsc (Old) and /work/SRC/openSUSE:Factory/.petsc.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "petsc" Thu Nov 28 13:51:18 2019 rev:18 rq:751565 version:3.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/petsc/petsc.changes 2019-09-30 15:59:01.301276864 +0200 +++ /work/SRC/openSUSE:Factory/.petsc.new.26869/petsc.changes 2019-11-28 13:51:30.346680348 +0100 @@ -1,0 +2,8 @@ +Wed Nov 27 16:38:25 UTC 2019 - Stefan BrĂ¼ns <stefan.bru...@rwth-aachen.de> + +- Reflect renaming of openmpi packages to openmpi1 in Tumbleweed, + fixes unresolvable packages. +- Fix copy'n'paste error, mpi_vers vs. mpi_ver +- Add non-HPC openmpi2 flavor. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ petsc.spec ++++++ --- /var/tmp/diff_new_pack.9rHwDp/_old 2019-11-28 13:51:31.346679968 +0100 +++ /var/tmp/diff_new_pack.9rHwDp/_new 2019-11-28 13:51:31.350679967 +0100 @@ -1,7 +1,7 @@ # # spec file for package petsc # -# 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 @@ -145,19 +145,17 @@ ExclusiveArch: do_not_build %endif +# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 +%if 0%{?suse_version} >= 1550 || "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1" +%define mpi_ext %{?mpi_vers} +%endif + %if %{without hpc} -%if 0%{!?package_name:1} %define package_name() %{pname}%{?with_mpi:-%{mpi_family}%{?mpi_ext}} -%endif %define libname() lib%{pname}%{so_ver}%{?with_mpi:-%{mpi_family}%{?mpi_ext}} %else %{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} -# For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" -%define mpi_ext %{?mpi_ver} -%endif - %define package_name() %{hpc_package_name %_vers} %define libname() lib%{pname}%{expand:%%{hpc_package_name_tail %{**}}} %global libname_plain %{libname} @@ -201,7 +199,7 @@ Patch2: petsc-3.3-p2-dont-check-for-option-mistakes.patch Patch3: petsc-3.3-fix-error-detection-in-makefile.patch Patch4: petsc-3.7-fix-pastix-detection.patch -Url: https://www.mcs.anl.gov/petsc/ +URL: https://www.mcs.anl.gov/petsc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{!?makedoc:1} BuildRequires: fdupes @@ -292,6 +290,9 @@ Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel Requires: ptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel + %if "%{mpi_family}%{?mpi_ext}" == "openmpi1" +Provides: %{pname}%-openmpi-devel + %endif %endif %else # with hpc Requires: %{libname %_vers} = %{version} ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.9rHwDp/_old 2019-11-28 13:51:31.394679950 +0100 +++ /var/tmp/diff_new_pack.9rHwDp/_new 2019-11-28 13:51:31.394679950 +0100 @@ -2,6 +2,7 @@ <package>doc</package> <package>serial</package> <package>openmpi</package> + <package>openmpi2</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package>