Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2019-01-10 15:23:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Thu Jan 10 15:23:42 2019 rev:58 rq:664167 version:4.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2018-06-25 11:41:32.967366020 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new.28833/octave.changes 2019-01-10 15:23:46.702303320 +0100 @@ -1,0 +2,12 @@ +Thu Jan 3 02:39:29 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to version 4.4.1 + * Long list of changes: see + https://www.gnu.org/software/octave/news/release/2018/08/09/octave-4.4.1-released.html +- Drop obsolete Fix-build-with-Qt-511.patch +- Fix build with Qt 5.12, use qhelpgenerator for qcollectiongenerator +- Stop messing with upstream appdata/desktop files +- Use %bcond_with/%bcond_without +- Fix unit tests by increasing JVM stack limit, see https://savannah.gnu.org/bugs/index.php?55395 + +------------------------------------------------------------------- Old: ---- Fix-build-with-Qt-511.patch octave-4.4.0.tar.lz New: ---- octave-4.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.8BBv9O/_old 2019-01-10 15:23:47.438302559 +0100 +++ /var/tmp/diff_new_pack.8BBv9O/_new 2019-01-10 15:23:47.438302559 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,50 +12,53 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # Use native graphics or gnuplot -%define with_native_graphics 1 +%bcond_without native_graphics + # Build GUI -%define with_gui 1 +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0 +%bcond_with gui +%else +%bcond_without gui +%endif + # Use Qt5 GUI -%define with_qt5gui 1 +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%bcond_with qt5gui +%else +%bcond_without qt5gui +%endif + # JIT compilation -%define with_jit 0 +%bcond_with jit + # JAVA support -%define with_java 1 +%bcond_without java + # Image processing library # Default variant - GraphicsMagick -%define with_imagemagick 0 -# Sound IO -%define with_sound 1 -# BLAS library -%define with_openblas 1 -# Build documentation -%define with_doc 1 - -%if 0%{?suse_version} <= 1320 -%define with_qt5gui 0 -%define with_doc 0 -%endif - -# SLE12 %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0 -%define with_gui 0 -%define with_jit 0 -%define with_imagemagick 1 +%bcond_without imagemagick +%else +%bcond_with imagemagick %endif -# architecture-specific -%ifarch %ix86 -# tests failure with openblas -%define with_openblas 0 +# Sound IO +%bcond_without sound + +# Build documentation +%if 0%{?suse_version} == 1315 +%bcond_with doc +%else +%bcond_without doc %endif Name: octave -Version: 4.4.0 +Version: 4.4.1 Release: 0 # Required for RC builds, in this case version contains ~rc, src_ver -rc %define src_ver %{version} @@ -64,18 +67,11 @@ Group: Productivity/Scientific/Math %define apiver v52 Url: http://www.octave.org/ -Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz +Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz Source2: octave.pc.in Source3: octave.macros -# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch Add a missing include -Patch0: Fix-build-with-Qt-511.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 @@ -86,7 +82,8 @@ BuildRequires: gperf BuildRequires: hdf5-devel BuildRequires: lapack-devel -%if 0%{?with_imagemagick} +BuildRequires: openblas-devel +%if %{with imagemagick} BuildRequires: pkgconfig(ImageMagick++) %else BuildRequires: pkgconfig(GraphicsMagick++) @@ -102,18 +99,18 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) # Documentation build requires -%if 0%{?with_doc} +%if %{with doc} BuildRequires: gnuplot BuildRequires: texinfo BuildRequires: texlive-dvips BuildRequires: texlive-latex %endif # GUI build requires -%if 0%{?with_gui} +%if %{with gui} BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files -%if 0%{?with_qt5gui} +%if %{with qt5gui} # Required for Patch0 BuildRequires: autoconf BuildRequires: automake @@ -138,28 +135,27 @@ Obsoletes: octave-gui < 4.0 %endif # Sound IO build requires -%if 0%{?with_sound} +%if %{with sound} BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(sndfile) %endif # JAVA functions build requires -%if 0%{?with_java} +%if %{with java} BuildRequires: java-devel %endif # JIT build requires -%if 0%{?with_jit} +%if %{with jit} BuildRequires: llvm-devel %endif # Native graphics build requires -%if 0%{?with_native_graphics} +%if %{with native_graphics} BuildRequires: Mesa-devel BuildRequires: fltk-devel BuildRequires: gl2ps-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(xft) %else Requires: gnuplot %endif @@ -172,10 +168,10 @@ %description Octave is a high level programming language. It is designed for the -solution of numeric problems. There is a command line interface -supplied. -%if 0%{?with_gui} -This package contains graphical user interface. +solution of numeric problems. +%if %{with gui} + +This package contains the graphical user interface. %endif %package cli @@ -183,7 +179,7 @@ Group: Productivity/Scientific/Math Requires: makeinfo Requires(pre): update-alternatives -%if 0%{?with_native_graphics} +%if %{with native_graphics} Recommends: epstool Recommends: pstoedit # transfig requires texlive installation now @@ -195,23 +191,19 @@ Octave is a high level programming language. It is designed for the solution of numeric problems. -This package contains command-line user interface. +This package contains the command-line user interface. %package devel Summary: Development files for Octave Group: Development/Languages/Other Requires: %{name}-cli = %{version} -%if 0%{?with_openblas} -Requires: openblas-devel -%else -Requires: blas-devel -%endif Requires: fftw3-devel Requires: fftw3-threads-devel Requires: gcc-c++ 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 @@ -223,9 +215,7 @@ %package doc Summary: Documentation for Octave Group: Documentation/Other -%if 0%{?suse_version} > 1110 BuildArch: noarch -%endif %description doc Octave is a high level programming language. It is designed for the @@ -235,34 +225,26 @@ %prep %setup -q -n %{name}-%{src_ver} -%patch0 -p1 # define octave_blas macros -%if 0%{?with_openblas} sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3} -%else -sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/blas/g' %{SOURCE3} -%endif %build -export CPPFLAGS="-DH5_USE_16_API" +export CFLAGS="%{optflags} -fPIE" +export CXXFLAGS="%{optflags} -fPIE" +export FFLAGS="%{optflags} -fPIE" +export LDFLAGS="-pie" +%if 0%{?suse_version} > 1500 +export QCOLLECTIONGENERATOR=qhelpgenerator-qt5 +%endif %configure \ --libexecdir=%{_libdir} \ - %if 0%{?with_openblas} + %{?with_gui: --enable-gui} \ + %{!?with_gui: --disable-gui} \ + %{?with_jit: --enable-jit} \ + %{!?with_java: --disable-java} \ --with-blas=openblas \ - %else - --with-blas=blas \ - %endif - %if %{?with_gui} == 0 - --disable-gui \ - %endif - %if %{?with_jit} == 1 - --enable-jit \ - %endif - %if %{?with_java} == 0 - --disable-java \ - %endif --enable-openmp make %{?_smp_mflags} @@ -288,39 +270,33 @@ # .pc file mkdir -p %{buildroot}/%{_libdir}/pkgconfig cp octave.pc %{buildroot}/%{_libdir}/pkgconfig -# big icons size -%if 0%{?suse_version} <= 1320 -rm -rf %{buildroot}/%{_datadir}/icons/hicolor/512x512/ -%endif # gui related fixes -%if %{?with_gui} -mv %{buildroot}/%{_datadir}/applications/*Octave.desktop %{buildroot}/%{_datadir}/applications/octave.desktop -%suse_update_desktop_file -r octave "Science;Math" -# appdata -mkdir %{buildroot}%{_datadir}/appdata/ -mv %{buildroot}%{_datadir}/metainfo/*Octave.appdata.xml %{buildroot}%{_datadir}/appdata/octave.appdata.xml -sed -i 's/www.octave.org-Octave.desktop/octave.desktop/' %{buildroot}%{_datadir}/appdata/octave.appdata.xml -sed -i 's/screenshot.png/screenshot-2016.png/' %{buildroot}%{_datadir}/appdata/octave.appdata.xml -%else +%if %{without gui} rm -rf %{buildroot}/%{_datadir}/icons/hicolor/ -rm -rf %{buildroot}/%{_datadir}/appdata/ +rm -rf %{buildroot}/%{_datadir}/metainfo/ +rm -rf %{buildroot}/%{_datadir}/applications/ %endif # rpm macros install -Dm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.octave +# increase stack size set by the JVM, affects the whole octave process +echo "-Xss8m" > %{buildroot}/%{_datadir}/%{name}/%{src_ver}/m/java/java.opts %check +# Increase stack limits. OpenBLAS tests are run after some JVM test, and OpenBLAS +# dgetrf is quite memory hungry, see https://github.com/xianyi/OpenBLAS/issues/246 +echo "-Xss8m" > scripts/java/java.opts make check %post /sbin/ldconfig -%if 0%{?with_gui} +%if %{with gui} %desktop_database_post %icon_theme_cache_post %endif %postun /sbin/ldconfig -%if 0%{?with_gui} +%if %{with gui} %desktop_database_postun %icon_theme_cache_postun %endif @@ -337,14 +313,14 @@ %license COPYING %doc AUTHORS BUGS NEWS %doc README ChangeLog -%if 0%{?with_gui} +%if %{with gui} %{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui %{_libdir}/%{name}/%{src_ver}/liboctgui.so.* %{_datadir}/%{name}/%{src_ver}/locale/ -%{_datadir}/appdata/*.xml +%{_datadir}/metainfo/*.xml %{_datadir}/applications/*.desktop %if 0%{?suse_version} <= 1315 -%dir %{_datadir}/appdata +%dir %{_datadir}/metainfo/ %endif %{_datadir}/icons/hicolor/*/apps/octave.* %endif @@ -354,13 +330,13 @@ %{_bindir}/octave-%{src_ver} %{_bindir}/octave-cli %{_bindir}/octave-cli-%{src_ver} -%if 0%{?with_doc} +%if %{with doc} %{_mandir}/man1/octave.1.gz %{_mandir}/man1/octave-cli.1.gz %endif %{_bindir}/octave-config %{_bindir}/octave-config-%{src_ver} -%if 0%{?with_doc} +%if %{with doc} %{_mandir}/man1/octave-config.1.gz %{_infodir}/*.gz %endif @@ -374,7 +350,7 @@ %{_libdir}/%{name}/%{src_ver}/oct %{_libdir}/%{name}/%{src_ver}/liboctave.so.* %{_libdir}/%{name}/%{src_ver}/liboctinterp.so.* -%if 0%{?with_gui} +%if %{with gui} %dir %{_libdir}/%{name}/%{src_ver}/exec/ %dir %{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/ %exclude %{_datadir}/%{name}/%{src_ver}/locale/ @@ -385,7 +361,7 @@ %files devel %{_bindir}/mkoctfile %{_bindir}/mkoctfile-%{src_ver} -%if 0%{?with_doc} +%if %{with doc} %{_mandir}/man1/mkoctfile.1.gz %endif %{_includedir}/*
