Hello community,
here is the log from the commit of package petsc for openSUSE:Factory checked
in at 2018-02-06 16:50:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/petsc (Old)
and /work/SRC/openSUSE:Factory/.petsc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "petsc"
Tue Feb 6 16:50:28 2018 rev:6 rq:573258 version:3.7.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/petsc/petsc.changes 2017-11-21
15:33:16.831235054 +0100
+++ /work/SRC/openSUSE:Factory/.petsc.new/petsc.changes 2018-02-06
16:50:29.412316248 +0100
@@ -1,0 +2,30 @@
+Tue Feb 6 09:18:55 UTC 2018 - e...@suse.com
+
+- Don't use baselibs.conf: some dependencies are not available for
+ i586 on Factory.
+
+-------------------------------------------------------------------
+Tue Feb 6 09:13:14 UTC 2018 - e...@suse.com
+
+- The HPC build of petsc depends on openBLAS. OpenBLAS doesn't
+ support s390: skip building on s390 (bsc#1079513).
+
+-------------------------------------------------------------------
+Mon Jan 29 15:22:04 UTC 2018 - e...@suse.com
+
+- Fix build with rpm v4.14.
+
+-------------------------------------------------------------------
+Fri Jan 12 15:49:16 UTC 2018 - e...@suse.com
+
+- Disable the openmpi3 flavor in some products.
+
+-------------------------------------------------------------------
+Fri Jan 5 19:15:30 UTC 2018 - e...@suse.com
+
+- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
+- Fix library package requires - use HPC macro (boo#1074890).
+- Add support for mpich and openmpi3 for HPC.
+- Fix unexpanded rpm macro in environment module file for HPC (boo#1074897).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ petsc.spec ++++++
--- /var/tmp/diff_new_pack.isJhmT/_old 2018-02-06 16:50:31.580214726 +0100
+++ /var/tmp/diff_new_pack.isJhmT/_new 2018-02-06 16:50:31.584214539 +0100
@@ -1,7 +1,7 @@
#
# spec file for package petsc
#
-# 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
@@ -23,6 +23,12 @@
%define _vers 3_7_6
%define so_ver 3
+%if 0%{?is_opensuse} || 0%{?is_backports}
+%undefine DisOMPI3
+%else
+%define DisOMPI3 ExclusiveArch: do_not_build
+%endif
+
%if "%flavor" == ""
%dfine package_name %pname
ExclusiveArch: do_not_build
@@ -43,6 +49,7 @@
%endif
%if "%flavor" == "gnu-openmpi-hpc"
+%{?DisOMPI1}
%define mpi_family openmpi
%define compiler_family gnu
%undefine c_f_ver
@@ -50,6 +57,15 @@
%{bcond_without hpc}
%endif
+%if "%flavor" == "gnu-openmpi3-hpc"
+%{?DisOMPI3}
+%define mpi_family openmpi
+%define compiler_family gnu
+%undefine c_f_ver
+%define mpi_vers 3
+%{bcond_without hpc}
+%endif
+
%if "%flavor" == "gnu-mvapich2-hpc"
%define mpi_family mvapich2
%define compiler_family gnu
@@ -57,21 +73,49 @@
%{bcond_without hpc}
%endif
-%if "%flavor" == "gnu6-openmpi-hpc"
+%if "%flavor" == "gnu-mpich-hpc"
+%define mpi_family mpich
+%define compiler_family gnu
+%undefine c_f_ver
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu7-openmpi-hpc"
+%{?DisOMPI1}
%define mpi_family openmpi
%define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
%define mpi_vers 1
%{bcond_without hpc}
%endif
-%if "%flavor" == "gnu6-mvapich2-hpc"
+%if "%flavor" == "gnu7-openmpi3-hpc"
+%{?DisOMPI3}
+%define mpi_family openmpi
+%define compiler_family gnu
+%define c_f_ver 7
+%define mpi_vers 3
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu7-mvapich2-hpc"
%define mpi_family mvapich2
%define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
%{bcond_without hpc}
%endif
+%if "%flavor" == "gnu7-mpich-hpc"
+%define mpi_family mpich
+%define compiler_family gnu
+%define c_f_ver 7
+%{bcond_without hpc}
+%endif
+
+%ifarch s390
+%{?with_hpc:ExclusiveArch: do_not_build}
+%endif
+
%if %{without hpc}
%if 0%{!?package_name:1}
%define package_name() %{pname}%{?with_mpi:-%{mpi_family}}
@@ -82,6 +126,7 @@
%define package_name() %{hpc_package_name %_vers}
%define libname() lib%{pname}%{expand:%%{hpc_package_name_tail %{**}}}
+%global libname_plain %{libname}
%endif
%if 0%{?mpi_family:1}
@@ -183,7 +228,7 @@
(parallel) solution of scientific applications modeled by partial
differential equations.
-%{?with_hpc:%{hpc_master_package -n %{libname} -l -L}}
+%{?with_hpc:%{hpc_master_package -n %{libname_plain} -l -L}}
%package %{?n_pre}devel
Summary: Devel files for petsc
@@ -208,7 +253,6 @@
Requires:
hdf5%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-%{mpi_family}%{?mpi_vers}-hpc-devel
Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
Requires:
libscalapack2%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-%{mpi_family}%{?mpi_vers}-hpc-devel
-Requires: lua-lmod
%hpc_requires_devel
%endif
@@ -233,7 +277,7 @@
%patch2 -p1 -b .option-mistakes
%patch3 -p1 -b .error-detect
%patch4 -p1 -b .pastix-detect
-%if %{without hpc}
+%if 0 && %{without hpc}
cat > %{_sourcedir}/baselibs.conf <<EOF
%{libname %_vers}
%{name}-devel
@@ -399,7 +443,7 @@
setenv %{hpc_upcase %pname}_DIR %{hpc_prefix}
if {[file isdirectory %{hpc_bindir}]} {
-setenv %{hpc_upcase %pname}_BIN %{hpc_bidnir}
+setenv %{hpc_upcase %pname}_BIN %{hpc_bindir}
}
if {[file isdirectory %{hpc_includedir}]} {
prepend-path LIBRARY_PATH %{hpc_libdir}
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.isJhmT/_old 2018-02-06 16:50:31.616213040 +0100
+++ /var/tmp/diff_new_pack.isJhmT/_new 2018-02-06 16:50:31.620212853 +0100
@@ -2,5 +2,7 @@
<package>serial</package>
<!-- <package>openmpi</package> -->
<package>gnu-openmpi-hpc</package>
+ <package>gnu-openmpi3-hpc</package>
<package>gnu-mvapich2-hpc</package>
+ <package>gnu-mpich-hpc</package>
</multibuild>
