Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2017-08-13 14:58:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Sun Aug 13 14:58:40 2017 rev:50 rq:515930 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2017-07-21 22:49:59.491715417 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-08-13 14:58:47.484147059 +0200 @@ -1,0 +2,7 @@ +Thu Aug 10 07:53:51 UTC 2017 - [email protected] + +- Reenable sparce matrix support +- Build with openBLAS library by default, except i*86 architectures + due to tests failures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.quyxuG/_old 2017-08-13 14:58:50.615707576 +0200 +++ /var/tmp/diff_new_pack.quyxuG/_new 2017-08-13 14:58:50.627705892 +0200 @@ -20,7 +20,7 @@ %define with_native_graphics 1 # Build GUI %define with_gui 1 -# Use Qt5 Qt5 GUI +# Use Qt5 GUI %define with_qt5gui 1 # JIT compilation %define with_jit 0 @@ -31,6 +31,8 @@ %define with_imagemagick 0 # Sound IO %define with_sound 1 +# BLAS library +%define with_openblas 1 %if 0%{?suse_version} <= 1320 %define with_qt5gui 0 @@ -50,6 +52,12 @@ %define with_imagemagick 1 %endif +# architecture-specific +%ifarch %ix86 +# tests failure with openblas +%define with_openblas 0 +%endif + Name: octave Version: 4.2.1 Release: 0 @@ -67,7 +75,11 @@ Patch0: octave-also-check-for-qscintilla2_qt5.patch BuildRequires: arpack-ng-devel BuildRequires: bison +%if 0%{?with_openblas} +BuildRequires: openblas-devel +%else BuildRequires: blas-devel +%endif BuildRequires: dejagnu BuildRequires: fftw3-threads-devel BuildRequires: flex @@ -89,6 +101,7 @@ BuildRequires: qhull-devel BuildRequires: qrupdate-devel BuildRequires: readline-devel +BuildRequires: suitesparse-devel BuildRequires: termcap BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) @@ -108,7 +121,7 @@ BuildRequires: automake BuildRequires: libtool # -BuildRequires: libqscintilla-qt5-devel +BuildRequires: libqscintilla_qt5-devel BuildRequires: libqt5-linguist BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -172,7 +185,8 @@ %if 0%{?with_native_graphics} Recommends: epstool Recommends: pstoedit -Recommends: transfig +# transfig requires texlive installation now +# Recommends: transfig %endif Recommends: octave-devel = %{version} Recommends: octave-doc = %{version} @@ -187,7 +201,11 @@ Summary: Development files for Octave Group: Productivity/Scientific/Math Requires: %{name}-cli = %{version} +%if 0%{?with_openblas} +Recommends: openblas-devel +%else Recommends: blas-devel +%endif Recommends: fftw3-devel Recommends: fftw3-threads-devel Recommends: gcc @@ -231,6 +249,11 @@ export CPPFLAGS="-DH5_USE_16_API" %configure \ --libexecdir=%{_libdir} \ + %if 0%{?with_openblas} + --with-blas=openblas \ + %else + --with-blas=blas \ + %endif %if %{?with_gui} == 0 --disable-gui \ %endif @@ -240,10 +263,6 @@ %if %{?with_java} == 0 --disable-java \ %endif - %if 0%{?suse_version} <= 1310 - --with-umfpack="-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack" \ - --with-cholmod="-lcholmod -lsuitesparseconfig -lrt" \ - %endif --enable-openmp make %{?_smp_mflags}
