rpm/mumps
SHA256
1
0
Fork 0
forked from pool/mumps
Code Pull Requests Activity

Accepting request 677191 from home:eeich:branches:science

Browse Source 
- Ship header files with devel package for each HPC build (bsc#1125551).

- Add explicit Requires: for matching libblacs2-* to non-HPC library package

OBS-URL: https://build.opensuse.org/request/show/677191
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=20
This commit is contained in:
Egbert Eich 2019-02-19 13:46:19 +00:00 committed by Git OBS Bridge
parent aa7fa6fb9b
commit b1ba68568d
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mumps.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Feb 14 18:24:28 UTC 2019 - Egbert Eich <eich@suse.com>
- Ship header files with devel package for each HPC build (bsc#1125551).
-------------------------------------------------------------------
Thu Feb 14 00:37:16 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Add explicit Requires: for matching libblacs2-* to non-HPC library package
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 14 09:11:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Thu Feb 14 09:11:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

18
mumps.spec
View File

@ -248,6 +248,9 @@ Summary: A MUltifrontal Massively Parallel Sparse direct Solver
Group: System/Libraries Group: System/Libraries
%if %{without hpc} %if %{without hpc}
%{?with_mpi:Recommends: %{name}-%{so_ver}-compat = %{version}} %{?with_mpi:Recommends: %{name}-%{so_ver}-compat = %{version}}
# Explicitly include this library here:
# the solver doesn't have enough information to pick the correct MPI flavor
%{?with_mpi:Requires: libblacs2-%{mpi_family}%{?mpi_ver}}
%else %else
Requires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc Requires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc
%hpc_requires %hpc_requires
@ -510,12 +513,12 @@ mkdir -p %{buildroot}%{my_libdir}
# install libs # install libs
cp -P lib/lib*.a %{buildroot}%{my_libdir} cp -P lib/lib*.a %{buildroot}%{my_libdir}
cp -P lib/lib*.so* %{buildroot}%{my_libdir} cp -P lib/lib*.so* %{buildroot}%{my_libdir}
%if %{without mpi} && %{without scotch} %if %{with hpc} || %{without mpi} && %{without scotch}
mkdir -p %{buildroot}%{_includedir}/mumps mkdir -p %{buildroot}%{my_incdir}/mumps
mkdir -p %{buildroot}%{_includedir}/pord mkdir -p %{buildroot}%{my_incdir}/pord
install -m 644 include/* %{buildroot}%{_includedir}/mumps install -m 644 include/* %{buildroot}%{my_incdir}/mumps
install -m 644 libseq/*.h %{buildroot}%{_includedir}/mumps install -m 644 libseq/*.h %{buildroot}%{my_incdir}/mumps
install -m 644 PORD/include/* %{buildroot}%{_includedir}/pord install -m 644 PORD/include/* %{buildroot}%{my_incdir}/pord
%endif %endif
install -m 755 examples/*simpletest %{buildroot}%{my_bindir} install -m 755 examples/*simpletest %{buildroot}%{my_bindir}
install -m 755 examples/c_example %{buildroot}%{my_bindir} install -m 755 examples/c_example %{buildroot}%{my_bindir}
@ -614,7 +617,8 @@ rm -rf examples/*.o examples/*simpletest examples/c_example examples/multiple_ar
%endif # mpi && !hpc %endif # mpi && !hpc
%files devel %files devel
%if %{without scotch} && %{without mpi} %if %{with hpc} || ( %{without scotch} && %{without mpi} )
%{?with_hpc:%dir %{my_incdir}}
%{my_incdir}/mumps %{my_incdir}/mumps
%{my_incdir}/pord %{my_incdir}/pord
%endif %endif