Accepting request 673334 from home:eeich:branches:science

- Version mumps, requires and buildrequires.
- Only include requires for the respecive flavor (non-scotch, scotch).

OBS-URL: https://build.opensuse.org/request/show/673334
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=15
This commit is contained in:
Egbert Eich 2019-02-11 12:37:11 +00:00 committed by Git OBS Bridge
parent e610d29287
commit 133cb79df6
2 changed files with 11 additions and 11 deletions

View File

@ -9,6 +9,8 @@ Sat Feb 9 13:40:09 UTC 2019 - eich@suse.com
- Build example binaries against shared libs for all builds.
- Add Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch:
make sure builds are serialized for 'make -j <n>'
- Version mumps, requires and buildrequires.
- Only include requires for the respecive flavor (non-scotch, scotch).
-------------------------------------------------------------------
Fri Feb 8 12:03:01 UTC 2019 - eich@suse.com

View File

@ -212,16 +212,10 @@ Source1: Makefile.inc
Patch1: Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch
%if %{without hpc}
BuildRequires: gcc-fortran
BuildRequires: scotch-devel
%{?with_scotch:BuildRequires: %{scotch}%{?with_mpi:-%{mpi_family}}-devel}
%if %{with mpi}
BuildRequires: libmumps%{?so_ver}
BuildRequires: %{pname}-devel
BuildRequires: %{pname}-devel-static
# Needed for non-HPC MPI builds to link to it from the MPI libdir - see below.
BuildRequires: libmumps-scotch%{?so_ver}
BuildRequires: %{pname}-scotch-devel
BuildRequires: %{pname}-scotch-devel-static
BuildRequires: ptscotch-%{mpi_family}-devel
BuildRequires: %{pname}%{?scotch:-scotch}-devel = %version
BuildRequires: %{pname}%{?scotch:-scotch}-devel-static = %version
BuildRequires: %{mpi_family}-devel
BuildRequires: scalapack-%{mpi_family}-devel
BuildRequires: libblacs2-%{mpi_family}-devel
@ -271,7 +265,11 @@ This package contains the parallel library%{?with_mpi: with %{mpi_family}}%{?sco
%package %{so_ver}-compat
Summary: A MUltifrontal Massively Parallel Sparse direct Solver
Group: System/Libraries
Requires: lib%{pname}%{?scotch:-scotch}%{so_ver}
%if %{without hpc} && %{with mpi}
# Needed for non-HPC MPI builds to link to it from the MPI libdir - see below.
BuildRequires: lib%{pname}%{?scotch:-scotch}%{so_ver} = %{version}
%endif
Requires: lib%{pname}%{?scotch:-scotch}%{so_ver} = %{version}
%description %{so_ver}-compat
MUMPS implements a direct solver for large sparse linear systems, with a
@ -352,7 +350,7 @@ Static libraries for %{package_name}.
%package %{so_ver}-static-compat
Summary: Files needed for developing mumps based applications
Group: Development/Libraries/Other
Requires: lib%{pname}%{?scotch:-scotch}%{so_ver}-static
Requires: lib%{pname}%{?scotch:-scotch}%{so_ver}-static = %version
%description %{so_ver}-static-compat
MUMPS implements a direct solver for large sparse linear systems, with a