Accepting request 672838 from home:eeich:branches:science

- Split off static packages & their link package (where applicable).
- Fix dependencies for devel packages.

OBS-URL: https://build.opensuse.org/request/show/672838
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=11

mumps.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  8 12:03:01 UTC 2019 - eich@suse.com
+
+- Split off static packages & their link package (where applicable).
+- Fix dependencies for devel packages.
+
 -------------------------------------------------------------------
 Thu Feb  7 19:51:43 UTC 2019 - eich@suse.com
 

mumps.spec

@@ -215,8 +215,10 @@ BuildRequires:  scotch-devel
 %if %{with mpi}
 BuildRequires:  libmumps%{?so_ver}
 BuildRequires:  %{pname}-devel
+BuildRequires:  %{pname}-devel-static
 BuildRequires:  libmumps-scotch%{?so_ver}
 BuildRequires:  %{pname}-scotch-devel
+BuildRequires:  %{pname}-scotch-devel-static
 BuildRequires:  ptscotch-%{mpi_family}-devel
 BuildRequires:  %{mpi_family}-devel
 BuildRequires:  scalapack-%{mpi_family}-devel
@@ -299,21 +301,28 @@ This package contains the parallel library%{?with_mpi: with %{mpi_family}}%{?sco
 %package -n %{libname %{?scotch:-l -%{scotch}}}-devel
 Summary:        Files needed for developing mumps based applications
 Group:          Development/Libraries/Other
+Requires:       lib%{libname -s %{so_ver} %{?scotch:-l -%{scotch}}} = %version
+%if %{without hpc}
+ %if %{with mpi} || %{with scotch}
+Requires:       mumps-devel = %{version}
+ %endif
+ %if %{with mpi}
+Requires:       %{mpi_family}-devel
+Requires:       scalapack-%{mpi_family}-devel
+  %if %{with scotch}
+Requires:       mumps-scotch-devel = %{version}
+Requires:       ptscotch-%{mpi_family}-devel
+  %endif
+ %else # mpi
 Requires:       blas-devel
 Requires:       lapack-devel
-Requires:       lib%{libname -s %{so_ver} %{?scotch:-l -%{scotch}}} = %version
+%{?with_scotch:Requires:       scotch-devel}
-%if %{without scotch}
+ %endif # mpi
- %if %{with mpi}
+%else # hpc
-Requires:       mumps-devel = %{version}
+%hpc_requires_devel
-Requires:       mumps-scotch-devel = %{version}
+Requires:  libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
-Requires:       %{mpi_family}-devel
+Requires:  libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
-Requires:       ptscotch-%{mpi_family}-devel
-Requires:       scalapack-%{mpi_family}-devel
- %endif
-%else
-Requires:       mumps-devel = %{version}
 %endif
-%{?with_hpc:%hpc_requires_devel}
 
 %description -n %{libname %{?scotch:-l -%{scotch}}}-devel
 MUMPS implements a direct solver for large sparse linear systems, with a
@@ -321,10 +330,35 @@ particular focus on symmetric positive definite matrices.  It can
 operate on distributed matrices e.g. over a cluster.  It has Fortran and
 C interfaces, and can interface with ordering tools such as Scotch.
 
-%if %{with mpi}
+Headers and development files for %{package_name}.
-This package contains the parallel library build with %{mpi_family}
+
-%{?scotch:and with %scotch }enabled.
+%package -n %{libname %{?scotch:-l -%{scotch}}}-devel-static
-%endif
+Summary:        Files needed for developing mumps based applications
+Group:          Development/Libraries/Other
+Requires:       %{libname %{?scotch:-l -%{scotch}}}-devel
+%{?with_mpi:Recommends:       %{name}-%{so_ver}-compat-static = %{version}}
+
+%description -n %{libname %{?scotch:-l -%{scotch}}}-devel-static
+MUMPS implements a direct solver for large sparse linear systems, with a
+particular focus on symmetric positive definite matrices.  It can
+operate on distributed matrices e.g. over a cluster.  It has Fortran and
+C interfaces, and can interface with ordering tools such as Scotch.
+
+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
+
+%description %{so_ver}-static-compat
+MUMPS implements a direct solver for large sparse linear systems, with a
+particular focus on symmetric positive definite matrices.  It can
+operate on distributed matrices e.g. over a cluster.  It has Fortran and
+C interfaces, and can interface with ordering tools such as Scotch.
+
+This package provides links to the static serial libraries from the MPI
+library directory MUMPS built for %{mpi_family}%{?mpi_ver}.
 
 %if %{without scotch}
 %package test
@@ -574,8 +608,16 @@ rm -rf %{buildroot}/%{my_bindir}
 %{my_incdir}/pord
  %endif
 %{my_libdir}/*.so
+
+%files -n %{libname %{?scotch:-l -%{scotch}}}-devel-static
+%{?with_mpi:%exclude %{my_libdir}/*%{!?scotch:_seq}%{?scotch:_scotch}.a}
 %{my_libdir}/*.a
 
+%if %{with mpi} && %{without hpc}
+%files %{so_ver}-static-compat
+%{my_libdir}/*%{!?scotch:_seq}%{?scotch:_scotch}.a
+%endif
+
 %if %{with mpi} && %{without scotch}
 %files test
 %doc examples