Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2018-05-29 10:32:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Tue May 29 10:32:47 2018 rev:55 rq:610623 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2018-03-19 23:40:38.508453938 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2018-05-29 10:32:55.211072719 +0200 @@ -1,0 +2,9 @@ +Wed May 16 19:57:17 UTC 2018 - [email protected] + +- Update to version 4.4.0 + See https://www.gnu.org/software/octave/NEWS-4.4.html for details +- Drop octave-java-use-source-target-1_6.patch +- Drop SLE11 support (already broken) +- Drop update-alternatives usage + +------------------------------------------------------------------- Old: ---- octave-4.2.2.tar.lz octave-java-use-source-target-1_6.patch New: ---- octave-4.4.0.tar.lz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.pu44n7/_old 2018-05-29 10:32:56.967007866 +0200 +++ /var/tmp/diff_new_pack.pu44n7/_new 2018-05-29 10:32:56.967007866 +0200 @@ -33,16 +33,12 @@ %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 -%endif - -# SLE11 -%if 0%{?suse_version} == 1110 -%define with_gui 0 -%define with_jit 0 -%define with_imagemagick 1 +%define with_doc 0 %endif # SLE12 @@ -59,20 +55,18 @@ %endif Name: octave -Version: 4.2.2 +Version: 4.4.0 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 v51 +%define apiver v52 Url: http://www.octave.org/ Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz Source2: octave.pc.in Source3: octave.macros -# PATCH-FIX-UPSTREAM octave-java-use-source-target-1_6.patch [email protected] -- Switch source/target to 1.6 from 1.3, to get octave building with java 9 (for openSUSE >= 1320); patch taken from upstream mercurial repository. -Patch1: octave-java-use-source-target-1_6.patch BuildRequires: arpack-ng-devel BuildRequires: bison %if 0%{?with_openblas} @@ -106,10 +100,12 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) # Documentation build requires +%if 0%{?with_doc} BuildRequires: gnuplot BuildRequires: texinfo BuildRequires: texlive-dvips BuildRequires: texlive-latex +%endif # GUI build requires %if 0%{?with_gui} BuildRequires: desktop-file-utils @@ -123,13 +119,16 @@ # BuildRequires: libqscintilla_qt5-devel BuildRequires: libqt5-linguist +BuildRequires: libqt5-qttools BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) %else BuildRequires: libqt4-devel +BuildRequires: libqt4-devel-doc BuildRequires: qscintilla-devel %endif Obsoletes: octave-gui < 4.0 @@ -164,8 +163,7 @@ BuildRequires: unzip BuildRequires: zip Requires: octave-cli = %{version} -Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(pre): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -180,8 +178,7 @@ Summary: Command-line user interface for Octave Group: Productivity/Scientific/Math Requires: makeinfo -Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(pre): update-alternatives %if 0%{?with_native_graphics} Recommends: epstool Recommends: pstoedit @@ -198,7 +195,7 @@ %package devel Summary: Development files for Octave -Group: Productivity/Scientific/Math +Group: Development/Languages/Other Requires: %{name}-cli = %{version} %if 0%{?with_openblas} Requires: openblas-devel @@ -242,15 +239,7 @@ sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/blas/g' %{SOURCE3} %endif -%if 0%{?suse_version} > 1320 -%patch1 -p1 -%endif - %build -# Patch0 and Patch1 edit m4 files, so regenerate configure -%if 0%{?with_qt5gui} || 0%{?suse_version} > 1320 -autoreconf -fvi -%endif export CPPFLAGS="-DH5_USE_16_API" %configure \ @@ -300,11 +289,12 @@ %endif # gui related fixes %if %{?with_gui} -mv %{buildroot}/%{_datadir}/applications/*octave.desktop %{buildroot}/%{_datadir}/applications/octave.desktop +mv %{buildroot}/%{_datadir}/applications/*Octave.desktop %{buildroot}/%{_datadir}/applications/octave.desktop %suse_update_desktop_file -r octave "Science;Math" # appdata -mv %{buildroot}%{_datadir}/appdata/*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 +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 rm -rf %{buildroot}/%{_datadir}/icons/hicolor/ @@ -312,39 +302,17 @@ %endif # rpm macros install -Dm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.octave -# dummy target for update-alternatives -install -d %{buildroot}/%{_sysconfdir}/alternatives -ln -s %{name} %{buildroot}/%{_sysconfdir}/alternatives/%{name} -# move gui binaries -mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_bindir}/%{name}-gui -mv %{buildroot}/%{_bindir}/%{name}-%{src_ver} %{buildroot}/%{_bindir}/%{name}-gui-%{src_ver} - -ln -s %{name}-%{src_ver} %{buildroot}/%{_bindir}/%{name} -ln -s %{name}-cli-%{src_ver} %{buildroot}/%{_bindir}/%{name}-%{src_ver} %check make check %post -%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver} %{name} %{_bindir}/%{name}-gui-%{src_ver} 50 /sbin/ldconfig %if 0%{?with_gui} %desktop_database_post %icon_theme_cache_post %endif -%posttrans -if [ "$1" = 0 ] ; then - if ! [ -f %{_bindir}/%{name}-%{src_ver} ] ; then - %{_sbindir}/update-alternatives --auto %{name} - fi -fi - -%preun -if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-gui-%{src_ver} -fi - %postun /sbin/ldconfig %if 0%{?with_gui} @@ -353,22 +321,9 @@ %endif %post cli -%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver} %{name} %{_bindir}/%{name}-cli-%{src_ver} 20 /sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/octave.info.gz -%posttrans cli -if [ "$1" = 0 ] ; then - if ! [ -f %{_bindir}/%{name}-%{src_ver} ] ; then - %{_sbindir}/update-alternatives --auto %{name} - fi -fi - -%preun cli -if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/%{name}-cli-%{src_ver} -fi - %postun cli /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz @@ -377,11 +332,6 @@ %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING NEWS %doc README ChangeLog -%ghost %{_sysconfdir}/alternatives/%{name} -%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver} -%ghost %{_bindir}/%{name}-%{src_ver} -%{_bindir}/%{name}-gui -%{_bindir}/%{name}-gui-%{src_ver} %if 0%{?with_gui} %{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui %{_libdir}/%{name}/%{src_ver}/liboctgui.so.* @@ -396,18 +346,20 @@ %files cli %defattr(-,root,root) -%{_bindir}/%{name} -%ghost %{_bindir}/%{name}-%{src_ver} -%ghost %{_sysconfdir}/alternatives/%{name} -%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver} +%{_bindir}/octave +%{_bindir}/octave-%{src_ver} %{_bindir}/octave-cli %{_bindir}/octave-cli-%{src_ver} +%if 0%{?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} %{_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} @@ -430,7 +382,9 @@ %defattr(-,root,root) %{_bindir}/mkoctfile %{_bindir}/mkoctfile-%{src_ver} +%if 0%{?with_doc} %{_mandir}/man1/mkoctfile.1.gz +%endif %{_includedir}/* %{_libdir}/%{name}/%{src_ver}/lib*.so %{_libdir}/%{name}/api-%{apiver}
