Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2020-02-10 21:55:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Mon Feb 10 21:55:04 2020 rev:64 rq:772663 version:5.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2019-07-08 15:10:56.919340691 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new.26092/octave.changes 2020-02-10 21:55:11.158249448 +0100 @@ -1,0 +2,19 @@ +Sun Feb 9 07:18:41 UTC 2020 - Stefan Brüns <[email protected]> + +- Update to version 5.2.0 + This version is a bug fixing release, for details see: + https://www.gnu.org/software/octave/news/release/2020/01/31/octave-5.2.0-released.html +- Drop upstream patches: + * octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch + * octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch + * octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch +- Use documentation from upstream tarball, no need to rebuild locally. +- Cleanup spec file, remove conditionals for EOLed distributions. + +------------------------------------------------------------------- +Wed Nov 27 20:13:20 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix octave_pkg_test in RPM octave.macros, unpack pkg tarball + again, as the target directory is removed by 'pkg build'. + +------------------------------------------------------------------- Old: ---- octave-5.1.0.tar.lz octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch New: ---- octave-5.2.0.tar.lz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.fDVTEc/_old 2020-02-10 21:55:13.490250736 +0100 +++ /var/tmp/diff_new_pack.fDVTEc/_new 2020-02-10 21:55:13.494250739 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,25 +18,14 @@ %define apiver v53 # Required for RC builds, in this case version contains ~rc, src_ver -rc -%define pkg_ver 5.1.0 +%define pkg_ver 5.2.0 %define src_ver %{pkg_ver} # Use native graphics or gnuplot %bcond_without native_graphics # Build GUI -%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0 -%bcond_with gui -%else %bcond_without gui -%endif - -# Use Qt5 GUI -%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -%bcond_with qt5gui -%else -%bcond_without qt5gui -%endif # JIT compilation %bcond_with jit @@ -46,22 +35,11 @@ # Image processing library # Default variant - GraphicsMagick -%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0 -%bcond_without imagemagick -%else %bcond_with imagemagick -%endif # Sound IO %bcond_without sound -# Build documentation -%if 0%{?suse_version} == 1315 -%bcond_with doc -%else -%bcond_without doc -%endif - # Allow building without openBLAS, e.g. for architectures # like RISC-V where openBLAS is not available %bcond_without openblas @@ -78,16 +56,12 @@ Summary: A High Level Programming Language License: GPL-3.0-or-later Group: Productivity/Scientific/Math -Url: http://www.octave.org/ +URL: http://www.octave.org/ Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz Source2: octave.pc.in Source3: octave.macros # PATCH-FIX-OPENSUSE Patch0: octave_tools_pie.patch -# PATCH-FIX-UPSTREAM -Patch1: octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch -Patch2: octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch -Patch3: octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch BuildRequires: arpack-ng-devel # Required for Patch0 BuildRequires: autoconf @@ -106,6 +80,7 @@ BuildRequires: gperf BuildRequires: hdf5-devel BuildRequires: lapack-devel +#BuildRequires: makeinfo BuildRequires: memory-constraints %if %{with imagemagick} BuildRequires: pkgconfig(ImageMagick++) @@ -122,22 +97,14 @@ BuildRequires: termcap BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) -# Documentation build requires -%if %{with doc} -BuildRequires: gnuplot -BuildRequires: texinfo -BuildRequires: texlive-dvips -BuildRequires: texlive-latex -%endif # GUI build requires %if %{with gui} BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%if %{with qt5gui} BuildRequires: libqscintilla_qt5-devel BuildRequires: libqt5-linguist BuildRequires: libqt5-qttools +BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) @@ -146,11 +113,6 @@ BuildRequires: pkgconfig(Qt5PrintSupport) # boo#1095605 Requires: libQt5Sql5-sqlite -%else -BuildRequires: libqt4-devel -BuildRequires: libqt4-devel-doc -BuildRequires: qscintilla-devel -%endif Obsoletes: octave-gui < 4.0 Provides: octave-gui = %{version} %endif @@ -184,7 +146,6 @@ BuildRequires: zip Requires: octave-cli = %{version} Requires(pre): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Octave is a high level programming language. It is designed for the @@ -245,13 +206,7 @@ %prep %setup -q -n %{name}-%{src_ver} -%if 0%{?suse_version} > 1315 -# autoconf in Leap 42.x is to old, so we just build without -pie there %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%endif # define octave_blas macros sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/%{blas_library}/g' %{SOURCE3} @@ -259,10 +214,8 @@ %build %limit_build -m 700 -%if 0%{?suse_version} > 1315 # rebuild makefiles after Patch0 autoreconf -i -s -f -%endif %if 0%{?suse_version} > 1500 export QCOLLECTIONGENERATOR=qhelpgenerator-qt5 %endif @@ -295,9 +248,14 @@ # mkdir -p %{buildroot}/%{_libdir}/%{name}/packages mkdir -p %{buildroot}/%{_datadir}/%{name}/packages +# Documentation +install -Dm 644 -t %{buildroot}%{_mandir}/man1/ doc/*/*.1 +install -Dm 644 -t %{buildroot}%{_infodir} doc/*/*.info doc/*/*.info-* # .pc file mkdir -p %{buildroot}/%{_libdir}/pkgconfig cp octave.pc %{buildroot}/%{_libdir}/pkgconfig +# Remove icons with huge size, we have scalable SVGs +rm -rf %{buildroot}/%{_datadir}/icons/hicolor/1024x1024 # gui related fixes %if %{without gui} rm -rf %{buildroot}/%{_datadir}/icons/hicolor/ @@ -315,19 +273,9 @@ echo "-Xss8m" > scripts/java/java.opts make check -%post -/sbin/ldconfig -%if %{with gui} -%desktop_database_post -%icon_theme_cache_post -%endif +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig -%if %{with gui} -%desktop_database_postun -%icon_theme_cache_postun -%endif +%postun -p /sbin/ldconfig %post cli /sbin/ldconfig @@ -348,9 +296,6 @@ %{_datadir}/%{name}/%{src_ver}/locale/ %{_datadir}/metainfo/*.xml %{_datadir}/applications/*.desktop -%if 0%{?suse_version} <= 1315 -%dir %{_datadir}/metainfo/ -%endif %{_datadir}/icons/hicolor/*/apps/octave.* %endif @@ -359,16 +304,12 @@ %{_bindir}/octave-%{src_ver} %{_bindir}/octave-cli %{_bindir}/octave-cli-%{src_ver} -%if %{with doc} %{_mandir}/man1/octave.1.gz %{_mandir}/man1/octave-cli.1.gz -%endif %{_bindir}/octave-config %{_bindir}/octave-config-%{src_ver} -%if %{with doc} %{_mandir}/man1/octave-config.1.gz %{_infodir}/*.gz -%endif %config %{_sysconfdir}/ld.so.conf.d/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/octaverc %dir %{_libdir}/%{name} @@ -390,9 +331,7 @@ %files devel %{_bindir}/mkoctfile %{_bindir}/mkoctfile-%{src_ver} -%if %{with doc} %{_mandir}/man1/mkoctfile.1.gz -%endif %{_includedir}/* %{_libdir}/%{name}/%{src_ver}/lib*.so %{_libdir}/%{name}/api-%{apiver} ++++++ octave.macros ++++++ --- /var/tmp/diff_new_pack.fDVTEc/_old 2020-02-10 21:55:13.542250765 +0100 +++ /var/tmp/diff_new_pack.fDVTEc/_new 2020-02-10 21:55:13.542250765 +0100 @@ -36,10 +36,11 @@ %octskiptests .*fetch.*|ga|csape|tbl(read|write)|princomp %octave_pkg_test \ + [ -e %{octpkg}-%{version} ] || tar xaf %{octpkg}-%{version}.tar.gz \ for fpath in $(find %{octpkg}-%{version} -name '*.m') ; do \ - filename="${fpath##*/}" ; \ - basename="${filename%.m}" ; \ if grep -q '^%\! *test' $fpath ; then \ + filename="${fpath##*/}" ; \ + basename="${filename%.m}" ; \ if echo $basename | grep -q -v -E '^(%{octskiptests})$' ; then \ %octave --eval "test $basename" | ( grep test || : ) > test.log ; \ if grep -s 'test *failed' test.log ; then \
