Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2019-03-26 15:39:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Tue Mar 26 15:39:07 2019 rev:61 rq:681704 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2019-02-19 12:03:00.685057208 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new.25356/octave.changes 2019-03-26 15:39:12.876329527 +0100 @@ -1,0 +2,12 @@ +Mon Mar 4 19:18:26 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to version 5.1.0 + * Long list of changes: see + https://www.gnu.org/software/octave/NEWS-5.1.html + https://www.gnu.org/software/octave/news/release/2019/03/01/octave-5.1-released.html +- Rebase octave_tools_pie.patch +- Add conditional building with blas instead of openBLAS. Allows building + for architectures like RISC-V where openBLAS is not available (and probably + never will, RISC-V vector instructions do not fit the openBLAS model). + +------------------------------------------------------------------- Old: ---- octave-4.4.1.tar.xz New: ---- octave-5.1.0.tar.lz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.f100Ji/_old 2019-03-26 15:39:14.076329049 +0100 +++ /var/tmp/diff_new_pack.f100Ji/_new 2019-03-26 15:39:14.080329047 +0100 @@ -16,6 +16,11 @@ # +%define apiver v53 +# Required for RC builds, in this case version contains ~rc, src_ver -rc +%define pkg_ver 5.1.0 +%define src_ver %{pkg_ver} + # Use native graphics or gnuplot %bcond_without native_graphics @@ -57,17 +62,24 @@ %bcond_without doc %endif +# Allow building without openBLAS, e.g. for architectures +# like RISC-V where openBLAS is not available +%bcond_without openblas + +%if %{with openblas} +%define blas_library openblas +%else +%define blas_library blas +%endif + Name: octave -Version: 4.4.1 +Version: %{pkg_ver} Release: 0 -# Required for RC builds, in this case version contains ~rc, src_ver -rc -%define src_ver %{version} Summary: A High Level Programming Language License: GPL-3.0-or-later Group: Productivity/Scientific/Math -%define apiver v52 Url: http://www.octave.org/ -Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz +Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz Source2: octave.pc.in Source3: octave.macros # PATCH-FIX-OPENSUSE @@ -78,6 +90,7 @@ BuildRequires: automake BuildRequires: libtool # +BuildRequires: %{blas_library}-devel BuildRequires: bison BuildRequires: dejagnu BuildRequires: fftw3-threads-devel @@ -90,7 +103,6 @@ BuildRequires: hdf5-devel BuildRequires: lapack-devel BuildRequires: memory-constraints -BuildRequires: openblas-devel %if %{with imagemagick} BuildRequires: pkgconfig(ImageMagick++) %else @@ -200,6 +212,7 @@ %package devel Summary: Development files for Octave Group: Development/Languages/Other +Requires: %{blas_library}-devel Requires: %{name}-cli = %{version} Requires: fftw3-devel Requires: fftw3-threads-devel @@ -207,7 +220,6 @@ Requires: gcc-fortran Requires: hdf5-devel Requires: make -Requires: openblas-devel %description devel Octave is a high level programming language. It is designed for the @@ -235,7 +247,7 @@ %endif # define octave_blas macros -sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3} +sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/%{blas_library}/g' %{SOURCE3} %build %limit_build -m 700 @@ -253,7 +265,7 @@ %{!?with_gui: --without-qt} \ %{?with_jit: --enable-jit} \ %{!?with_java: --disable-java} \ - --with-blas=openblas \ + --with-blas=%{blas_library} \ --enable-openmp make %{?_smp_mflags} @@ -324,6 +336,7 @@ %doc README ChangeLog %if %{with gui} %{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui +%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-svgconvert %{_libdir}/%{name}/%{src_ver}/liboctgui.so.* %{_datadir}/%{name}/%{src_ver}/locale/ %{_datadir}/metainfo/*.xml @@ -377,6 +390,7 @@ %{_libdir}/%{name}/%{src_ver}/lib*.so %{_libdir}/%{name}/api-%{apiver} %{_libdir}/pkgconfig/octave.pc +%{_libdir}/pkgconfig/octinterp.pc %config %{_sysconfdir}/rpm/macros.octave %files doc ++++++ octave_tools_pie.patch ++++++ --- /var/tmp/diff_new_pack.f100Ji/_old 2019-03-26 15:39:14.160329016 +0100 +++ /var/tmp/diff_new_pack.f100Ji/_new 2019-03-26 15:39:14.160329016 +0100 @@ -1,6 +1,6 @@ --- octave-4.4.1/src/module.mk_orig 2019-01-11 00:52:01.913918346 +0100 +++ octave-4.4.1/src/module.mk 2019-01-11 18:44:13.272208383 +0100 -@@ -68,6 +68,7 @@ +@@ -73,6 +73,7 @@ %canon_reldir%_octave_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) \ @@ -8,7 +8,7 @@ $(WARN_LDFLAGS) if AMCOND_BUILD_QT_GUI -@@ -92,6 +93,7 @@ +@@ -93,6 +94,7 @@ %canon_reldir%_octave_cli_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) \ @@ -16,17 +16,17 @@ $(WARN_LDFLAGS) %canon_reldir%_octave_cli_CPPFLAGS = \ -@@ -121,6 +123,7 @@ +@@ -118,6 +120,7 @@ %canon_reldir%_octave_gui_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) \ + -pie \ $(WARN_LDFLAGS) - %canon_reldir%_octave_gui_CXXFLAGS = \ -@@ -143,8 +146,14 @@ - $(AM_CXXFLAGS) \ - $(WARN_CXXFLAGS) + %canon_reldir%_octave_svgconvert_SOURCES = %reldir%/octave-svgconvert.cc +@@ -140,8 +143,14 @@ + $(SRC_DIR_CPPFLAGS) \ + $(OCTAVE_CPPFLAGS) +%canon_reldir%_mkoctfile_LDFLAGS = \ + -pie
