Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2016-10-23 12:52:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-10-20 23:09:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-10-23 12:52:31.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 19 07:12:08 UTC 2016 - dmitr...@opensuse.org + +- Build Qt5-based GUI for openSUSE Tumbleweed +- Clean build requires +- Move pkg-config file to octave-devel package + +------------------------------------------------------------------- @@ -13 +20 @@ -- Update to version 4.2.0~rc1 +- Update to version 4.2.0~rc2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.QFCUBZ/_old 2016-10-23 12:52:32.000000000 +0200 +++ /var/tmp/diff_new_pack.QFCUBZ/_new 2016-10-23 12:52:32.000000000 +0200 @@ -20,6 +20,8 @@ %define with_native_graphics 1 # Build GUI %define with_gui 1 +# Use Qt5 Qt5 GUI +%define with_qt5gui 1 # JIT compilation %define with_jit 0 # JAVA support @@ -30,6 +32,10 @@ # Sound IO %define with_sound 1 +%if 0%{?suse_version} <= 1320 +%define with_qt5gui 0 +%endif + # SLE11 %if 0%{?suse_version} == 1110 %define with_gui 0 @@ -63,23 +69,18 @@ BuildRequires: dejagnu BuildRequires: fftw3-threads-devel BuildRequires: flex -BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: gl2ps-devel BuildRequires: glpk-devel BuildRequires: gmp-devel -BuildRequires: gnuplot BuildRequires: gperf BuildRequires: hdf5-devel BuildRequires: lapack-devel %if 0%{?with_imagemagick} -BuildRequires: libMagick++-devel +BuildRequires: pkgconfig(ImageMagick++) %else -BuildRequires: libGraphicsMagick++-devel +BuildRequires: pkgconfig(GraphicsMagick++) %endif -BuildRequires: libcurl-devel -BuildRequires: liblcms-devel BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: qhull-devel @@ -87,27 +88,38 @@ BuildRequires: readline-devel BuildRequires: suitesparse-devel BuildRequires: termcap +BuildRequires: xz +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) +# Documentation build requires +BuildRequires: gnuplot BuildRequires: texinfo -%if 0%{?suse_version} > 1220 BuildRequires: texlive-dvips -%endif BuildRequires: texlive-latex -BuildRequires: xz -BuildRequires: zlib-devel # GUI build requires %if 0%{?with_gui} BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +%if 0%{?with_qt5gui} +BuildRequires: libqscintilla-qt5-devel +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5PrintSupport) +%else BuildRequires: libqt4-devel BuildRequires: qscintilla-devel -BuildRequires: update-desktop-files +%endif Obsoletes: octave-gui < 4.0 %endif # Sound IO build requires %if 0%{?with_sound} -BuildRequires: alsa-devel -BuildRequires: libsndfile-devel -BuildRequires: portaudio-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(portaudio-2.0) +BuildRequires: pkgconfig(sndfile) %endif # JAVA functions build requires %if 0%{?with_java} @@ -119,16 +131,13 @@ %endif # Native graphics build requires %if 0%{?with_native_graphics} -%if 0%{?suse_version} > 1220 -BuildRequires: glu-devel -%endif BuildRequires: Mesa-devel BuildRequires: fltk-devel -BuildRequires: fontconfig-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libSM-devel -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXext-devel +BuildRequires: gl2ps-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(xft) %else Requires: gnuplot %endif @@ -379,13 +388,13 @@ %endif %{_datadir}/octave/ %{_libdir}/%{name}/site -%{_libdir}/pkgconfig/octave.pc %files devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/%{name}/%{src_ver}/lib*.so %{_libdir}/%{name}/api-%{apiver} +%{_libdir}/pkgconfig/octave.pc %config %{_sysconfdir}/rpm/macros.octave %files doc