From 06758816f3f5208967adf9ab85598740b4796d5ccfb67990b4ffea6458a0a867 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 19 Jun 2018 21:59:47 +0000 Subject: [PATCH] Accepting request 617822 from openSUSE:Factory:RISCV - Add option to build without openblas - Use %license for COPYING.LESSER OBS-URL: https://build.opensuse.org/request/show/617822 OBS-URL: https://build.opensuse.org/package/show/science/fflas-ffpack?expand=0&rev=29 --- fflas-ffpack.changes | 6 ++++++ fflas-ffpack.spec | 21 +++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/fflas-ffpack.changes b/fflas-ffpack.changes index ad942c6..141d52d 100644 --- a/fflas-ffpack.changes +++ b/fflas-ffpack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 19 15:49:54 UTC 2018 - schwab@suse.de + +- Add option to build without openblas +- Use %license for COPYING.LESSER + ------------------------------------------------------------------- Mon Dec 25 17:03:23 UTC 2017 - jengelh@inai.de diff --git a/fflas-ffpack.spec b/fflas-ffpack.spec index ca36645..bd6fc84 100644 --- a/fflas-ffpack.spec +++ b/fflas-ffpack.spec @@ -1,7 +1,7 @@ # # spec file for package fflas-ffpack # -# 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 @@ -22,12 +22,14 @@ %define atlas %_libdir/atlas %endif +%bcond_without openblas + Name: fflas-ffpack %define lname libfflas0 Version: 2.3.2 Release: 0 Summary: Finite Field Linear Algebra Subroutines -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Scientific/Math Url: https://linbox-team.github.io/fflas-ffpack/ @@ -38,7 +40,12 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gmp-devel >= 3.1.1 BuildRequires: libtool >= 2.2 +%if %{with openblas} BuildRequires: openblas-devel +%else +BuildRequires: blas-devel +BuildRequires: cblas-devel +%endif BuildRequires: pkg-config BuildRequires: pkgconfig(givaro) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,7 +89,12 @@ if [ ! -e configure ]; then fi trap "cat config.log; exit 1" ERR %configure \ - --with-blas-cflags=" " --with-blas-libs="-lopenblas" \ + --with-blas-cflags=" " \ +%if %{with openblas} + --with-blas-libs="-lopenblas" \ +%else + --with-blas-libs="-lcblas -lblas" \ +%endif --enable-doc --with-docdir="%_docdir/%name" --disable-simd trap "" ERR make %{?_smp_mflags} @@ -94,7 +106,8 @@ rm -f "%buildroot/%_docdir/%name/fflas-ffpack-html/INSTALL" %files devel %defattr(-,root,root) -%doc ChangeLog COPYING.LESSER +%doc ChangeLog +%license COPYING.LESSER %_bindir/fflas-ffpack-config %_includedir/fflas-ffpack/ %_libdir/pkgconfig/ff*.pc