Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2013-12-31 10:05:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-30 16:36:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-12-31 10:05:45.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Dec 28 20:34:15 UTC 2013 - dmitry_r@opensuse.org + +- Update to version 3.8.0 + * See included NEWS and ChangeLog files for details +- Removed obsolete octave-gcc48-mex_remove_externc.patch + +------------------------------------------------------------------- Old: ---- octave-3.6.4.tar.bz2 octave-gcc48-mex_remove_externc.patch New: ---- octave-3.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.xmQ4c9/_old 2013-12-31 10:05:46.000000000 +0100 +++ /var/tmp/diff_new_pack.xmQ4c9/_new 2013-12-31 10:05:46.000000000 +0100 @@ -20,17 +20,15 @@ %define gnuplot 0 Name: octave -Version: 3.6.4 +Version: 3.8.0 Release: 0 Summary: A High Level Programming Language License: GPL-3.0+ Group: Productivity/Scientific/Math -%define apiver v48+ +%define apiver v49+ Url: http://www.octave.org/ Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2 Source2: octave.pc.in -#PATCH-FIX-UPSTREAM octave-gcc48-mex_remove_externc.patch - fixes problem when including mex.h when building packages, upstream changeset 16705:122d3f62e179 -Patch1: octave-gcc48-mex_remove_externc.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -40,14 +38,25 @@ 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: java-devel BuildRequires: lapack-devel +%if 0%{?suse_version} > 1110 +BuildRequires: libGraphicsMagick++-devel +%else BuildRequires: libMagick++-devel +%endif BuildRequires: libcurl-devel BuildRequires: liblcms-devel +%if 0%{?suse_version} > 1110 +BuildRequires: libqscintilla-devel +BuildRequires: libqt4-devel +%endif BuildRequires: makeinfo BuildRequires: pcre-devel BuildRequires: pkg-config @@ -95,6 +104,17 @@ solution of numeric problems. There is a command line interface supplied. +%if 0%{?suse_version} > 1110 +%package gui +Summary: Graphical user interface for octave +Group: Productivity/Scientific/Math + +%description gui +Octave is a high level programming language. It is designed for the +solution of numeric problems. This package contains official graphical +user interface. +%endif + %package devel Summary: Development files for octave Group: Productivity/Scientific/Math @@ -117,13 +137,17 @@ %prep %setup -q -%if 0%{suse_version} >= 1210 -%patch1 -p3 -d src -%endif %build export CPPFLAGS="-DH5_USE_16_API" -%configure --libexecdir=%{_libdir} --with-magick=ImageMagick --with-umfpack="-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack" --with-cholmod="-lcholmod -lsuitesparseconfig -lrt" +%configure \ + --libexecdir=%{_libdir} \ + %if 0%{?suse_version} < 1120 + --disable-gui \ + %endif + --with-umfpack="-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack" \ + --with-cholmod="-lcholmod -lsuitesparseconfig -lrt" + make %{?_smp_mflags} # .pc file cp %{SOURCE2} octave.pc @@ -147,9 +171,9 @@ mkdir -p %{buildroot}/%{_libdir}/pkgconfig cp octave.pc %{buildroot}/%{_libdir}/pkgconfig # use native graphics -%if %{gnuplot} == 0 -echo 'graphics_toolkit fltk' >> %{buildroot}/%{_sysconfdir}/%{name}/octaverc -%endif +# %if %{gnuplot} == 0 +# echo 'graphics_toolkit fltk' >> %{buildroot}/%{_sysconfdir}/%{name}/octaverc +# %endif %check make check %{?_smp_mflags} @@ -162,13 +186,28 @@ /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz +%if 0%{?suse_version} > 1110 +%post gui +/sbin/ldconfig + +%postun gui +/sbin/ldconfig +%endif + %files %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING NEWS %doc README ChangeLog %doc %{_infodir}/*.gz %doc %{_mandir}/man1/*.gz -%{_bindir}/* +%{_bindir}/octave +%{_bindir}/octave-%{version} +%{_bindir}/octave-cli +%{_bindir}/octave-cli-%{version} +%{_bindir}/mkoctfile +%{_bindir}/mkoctfile-%{version} +%{_bindir}/octave-config +%{_bindir}/octave-config-%{version} %config %{_sysconfdir}/ld.so.conf.d/%{name}.conf %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{version} @@ -176,12 +215,27 @@ %dir %{_datadir}/%{name}/packages %dir %{_sysconfdir}/%{name} %{_libdir}/%{name}/%{version}/oct -%{_libdir}/%{name}/%{version}/lib*.so.* +%{_libdir}/%{name}/%{version}/liboctave.so.* +%{_libdir}/%{name}/%{version}/liboctinterp.so.* +%if 0%{?suse_version} > 1110 +%dir %{_libdir}/%{name}/%{version}/exec/ +%dir %{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/ +%endif + %{_datadir}/octave/ %{_libdir}/%{name}/site %config(noreplace) %{_sysconfdir}/%{name}/octaverc %{_libdir}/pkgconfig/octave.pc +%if 0%{?suse_version} > 1110 +%files gui +%defattr(-,root,root) +# %{_bindir}/octave-gui +# %{_bindir}/octave-gui-%{version} +%{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/octave-gui +%{_libdir}/%{name}/%{version}/liboctgui.so.* +%endif + %files devel %defattr(-,root,root) %{_includedir}/* ++++++ octave-3.6.4.tar.bz2 -> octave-3.8.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/octave/octave-3.6.4.tar.bz2 /work/SRC/openSUSE:Factory/.octave.new/octave-3.8.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org