Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2014-01-03 19:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-31 10:05:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-01-03 19:47:26.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Jan 2 08:47:14 UTC 2014 - [email protected] + +- Fix loading gzip-compressed info files [bnc#857130] + * octave-3.8.0-gzip-compressed-info.patch + +------------------------------------------------------------------- +Mon Dec 30 07:59:12 UTC 2013 - [email protected] + +- Add octave-gui as recommended dependence +- Build with jit support + +------------------------------------------------------------------- New: ---- octave-3.8.0-gzip-compressed-info.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.ea9X0w/_old 2014-01-03 19:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ea9X0w/_new 2014-01-03 19:47:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,14 @@ # -# gnuplot 0 -> use native graphics -%define gnuplot 0 +%define with_native_graphics 1 +%if 0%{?suse_version} > 1110 +%define with_gui 1 +%else +%define with_gui 0 +%endif +%define with_jit 1 +%define with_java 1 Name: octave Version: 3.8.0 @@ -29,6 +35,8 @@ Url: http://www.octave.org/ Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2 Source2: octave.pc.in +# PATCH-FIX-UPSTREAM octave-3.8.0-gzip-compressed-info.patch bnc#857130 +Patch1: octave-3.8.0-gzip-compressed-info.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -44,7 +52,9 @@ BuildRequires: gnuplot BuildRequires: gperf BuildRequires: hdf5-devel +%if 0%{?with_java} BuildRequires: java-devel +%endif BuildRequires: lapack-devel %if 0%{?suse_version} > 1110 BuildRequires: libGraphicsMagick++-devel @@ -53,10 +63,11 @@ %endif BuildRequires: libcurl-devel BuildRequires: liblcms-devel -%if 0%{?suse_version} > 1110 +%if 0%{?with_gui} BuildRequires: libqscintilla-devel BuildRequires: libqt4-devel %endif +BuildRequires: llvm-devel BuildRequires: makeinfo BuildRequires: pcre-devel BuildRequires: pkg-config @@ -74,7 +85,7 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: zlib-devel -%if %{gnuplot} == 0 +%if 0%{?with_native_graphics} # for native graphics %if 0%{?suse_version} > 1220 BuildRequires: glu-devel @@ -84,7 +95,6 @@ BuildRequires: fontconfig-devel BuildRequires: xorg-x11-devel %else -BuildRequires: gnuplot Requires: gnuplot %endif Requires: texinfo @@ -95,8 +105,11 @@ Recommends: gcc-fortran Recommends: hdf5-devel Recommends: make -Recommends: octave-devel -Recommends: octave-doc +Recommends: octave-devel = %{version} +Recommends: octave-doc = %{version} +%if 0%{?with_gui} +Recommends: octave-gui = %{version} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -104,7 +117,7 @@ solution of numeric problems. There is a command line interface supplied. -%if 0%{?suse_version} > 1110 +%if 0%{?with_gui} %package gui Summary: Graphical user interface for octave Group: Productivity/Scientific/Math @@ -137,14 +150,21 @@ %prep %setup -q +%patch1 -p1 %build export CPPFLAGS="-DH5_USE_16_API" %configure \ --libexecdir=%{_libdir} \ - %if 0%{?suse_version} < 1120 + %if %{?with_gui} == 0 --disable-gui \ %endif + %if %{?with_jit} == 0 + --disable-jit \ + %endif + %if %{?with_java} == 0 + --disable-java \ + %endif --with-umfpack="-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack" \ --with-cholmod="-lcholmod -lsuitesparseconfig -lrt" @@ -170,13 +190,9 @@ # .pc file 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 %check -make check %{?_smp_mflags} +make check %post /sbin/ldconfig @@ -186,7 +202,7 @@ /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz -%if 0%{?suse_version} > 1110 +%if 0%{?with_gui} %post gui /sbin/ldconfig @@ -217,21 +233,18 @@ %{_libdir}/%{name}/%{version}/oct %{_libdir}/%{name}/%{version}/liboctave.so.* %{_libdir}/%{name}/%{version}/liboctinterp.so.* -%if 0%{?suse_version} > 1110 +%if 0%{?with_gui} %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 +%if 0%{?with_gui} %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 ++++++ octave-3.8.0-gzip-compressed-info.patch ++++++ # HG changeset patch # User Mike Miller <[email protected]> # Date 1388583823 18000 # Node ID ab775508dff9d54266e5cb8f965201298a11d66f # Parent d638db6d045cef65a529ce1a232da22443806805 doc.m: Check for existence of compressed info file (bug #41054) * doc.m: Check for existence of compressed info file, since info files are commonly gzip-compressed in binary distributions. diff --git a/scripts/help/doc.m b/scripts/help/doc.m --- a/scripts/help/doc.m +++ b/scripts/help/doc.m @@ -80,7 +80,8 @@ if (err < 0) info_file_name = info_file (); - if (! exist (info_file_name, "file")) + if (! exist (info_file_name, "file") + && ! exist ([info_file_name ".gz"], "file")) __gripe_missing_component__ ("doc", "info-file"); endif endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
