Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2014-11-13 09:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2014-11-03 13:13:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-11-13 09:18:31.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 12 13:31:29 UTC 2014 - dmitr...@opensuse.org + +- Set build settings for SLE12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.MC8LfW/_old 2014-11-13 09:18:32.000000000 +0100 +++ /var/tmp/diff_new_pack.MC8LfW/_new 2014-11-13 09:18:32.000000000 +0100 @@ -19,11 +19,7 @@ # Use native graphics or gnuplot %define with_native_graphics 1 # Build GUI -%if 0%{?suse_version} > 1110 %define with_gui 1 -%else -%define with_gui 0 -%endif # JIT support # Works only on x86 and x86_64 %ifarch %ix86 x86_64 @@ -31,12 +27,18 @@ %else %define with_jit 0 %endif -# old versions don't contain llvm -%if 0%{?suse_version} < 1210 -%define with_jit 0 -%endif # JAVA support %define with_java 1 +# Image processing library +# Default variant - GraphicsMagick +%define with_imagemagick 0 + +# SLE12 +%if 0%{?suse_version} == 1315 +%define with_gui 0 +%define with_jit 0 +%define with_imagemagick 1 +%endif Name: octave Version: 3.8.2 @@ -71,10 +73,10 @@ BuildRequires: java-devel %endif BuildRequires: lapack-devel -%if 0%{?suse_version} > 1110 -BuildRequires: libGraphicsMagick++-devel -%else +%if 0%{?with_imagemagick} BuildRequires: libMagick++-devel +%else +BuildRequires: libGraphicsMagick++-devel %endif BuildRequires: libcurl-devel BuildRequires: liblcms-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org