Hello community, here is the log from the commit of package suitesparse for openSUSE:Factory checked in at 2018-02-28 20:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suitesparse (Old) and /work/SRC/openSUSE:Factory/.suitesparse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suitesparse" Wed Feb 28 20:00:44 2018 rev:24 rq:580335 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/suitesparse/suitesparse.changes 2017-10-18 10:44:21.498128096 +0200 +++ /work/SRC/openSUSE:Factory/.suitesparse.new/suitesparse.changes 2018-02-28 20:00:45.980230910 +0100 @@ -1,0 +2,5 @@ +Wed Feb 14 10:36:16 UTC 2018 - [email protected] + +- Make openblas optional, using lapack instead + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suitesparse.spec ++++++ --- /var/tmp/diff_new_pack.Pa3Oqz/_old 2018-02-28 20:00:48.248148850 +0100 +++ /var/tmp/diff_new_pack.Pa3Oqz/_new 2018-02-28 20:00:48.256148560 +0100 @@ -1,7 +1,7 @@ # # spec file for package suitesparse # -# 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 @@ -16,6 +16,12 @@ # +%ifarch m68k riscv64 +%bcond_with openblas +%else +%bcond_without openblas +%endif + Name: suitesparse Summary: A collection of sparse matrix libraries License: GPL-2.0+ and LGPL-2.1+ @@ -31,7 +37,9 @@ BuildRequires: gcc-fortran BuildRequires: lapack-devel BuildRequires: metis-devel +%if %{with openblas} BuildRequires: openblas-devel +%endif BuildRequires: openmpi-devel %define amdver 2.4.6 %define amdso 2_4_6 @@ -102,7 +110,11 @@ Requires: %{spqrlib} = %{spqrver} Requires: %{umfpacklib} = %{umfpackver} Requires: metis-devel +%if %{with openblas} Requires: openblas-devel +%else +Requires: lapack-devel +%endif Requires: openmpi-devel # make sure developers can find these packages Provides: suitesparse-common-devel = %{version} @@ -225,9 +237,9 @@ Version: %{cholmodver} Release: 0 Summary: Supernodal Sparse Cholesky Factorization and Update/Downdate -#bnc746867 cholmod from suitesparse should be GPL-2.0 and/or LGPL-2.0 licensed License: GPL-2.0 and LGPL-2.1 Group: System/Libraries +#bnc746867 cholmod from suitesparse should be GPL-2.0 and/or LGPL-2.0 licensed %description -n %{cholmodlib} CHOLMOD is a set of ANSI C routines for sparse Cholesky factorization @@ -427,6 +439,9 @@ %prep %setup -q -n SuiteSparse sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i SuiteSparse_config/SuiteSparse_config.mk +%if %{without openblas} +sed 's/-lopenblas/-lblas/' -i SuiteSparse_config/SuiteSparse_config.mk +%endif # bnc#751746 rm -rf MATLAB_Tools/Factorize/Doc/factorize_article.pdf @@ -448,15 +463,20 @@ popd # libraries linking config [bnc#883683] +%if %{with openblas} +blas_lib=-lopenblas +%else +blas_lib=-lblas +%endif amd_libs="libsuitesparseconfig.so" camd_libs="libsuitesparseconfig.so" ccolamd_libs="libsuitesparseconfig.so" -cholmod_libs="libamd.so libcamd.so libcolamd.so libccolamd.so libsuitesparseconfig.so -lopenblas -llapack -lmetis" +cholmod_libs="libamd.so libcamd.so libcolamd.so libccolamd.so libsuitesparseconfig.so $blas_lib -llapack -lmetis" colamd_libs="libsuitesparseconfig.so" klu_libs="libamd.so libbtf.so libcolamd.so" rbio_libs="libsuitesparseconfig.so" -spqr_libs="libcholmod.so libsuitesparseconfig.so -lopenblas -llapack -lmetis" -umfpack_libs="libamd.so libcholmod.so libsuitesparseconfig.so -lopenblas -llapack -lmetis" +spqr_libs="libcholmod.so libsuitesparseconfig.so $blas_lib -llapack -lmetis" +umfpack_libs="libamd.so libcholmod.so libsuitesparseconfig.so $blas_lib -llapack -lmetis" for dir in AMD BTF CAMD CCOLAMD COLAMD CHOLMOD CSparse CXSparse KLU LDL RBio SPQR UMFPACK; do pushd $dir
