---- octave-2.1.70/doc/faq/OctaveFAQ.texi.orig 2005-05-17 23:59:37.897649368 +0200
-+++ octave-2.1.70/doc/faq/OctaveFAQ.texi 2005-05-18 00:00:05.425464504 +0200
-@@ -4,8 +4,9 @@
- @settitle Frequently asked questions about Octave (with answers)
-
- @setchapternewpage off
-+@dircategory Programming Languages:
- @direntry
--* OctaveFAQ: (OctaveFAQ). Frequently asked questions about Octave
-+* OctaveFAQ: (OctaveFAQ). Frequently asked questions about Octave
- @end direntry
- @titlepage
- @title Octave FAQ
diff -Nur octave-2.1.36.orig/doc/interpreter/octave.texi octave-2.1.36/doc/interpreter/octave.texi
--- octave-2.1.36.orig/doc/interpreter/octave.texi Wed Jan 2 20:35:23 2002
+++ octave-2.1.36/doc/interpreter/octave.texi Sat Nov 2 11:49:49 2002
@end format
@end ifinfo
---- octave-3.6.4/doc/interpreter/strings.texi~ 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/strings.texi 2013-07-10 00:02:48.495061805 +0200
-@@ -1136,7 +1136,7 @@
- @item %s
- The word is parsed as a string.
-
--@itemx %f
-+@item %f
- @itemx %n
- The word is parsed as a number and converted to double.
-
-diff -ur octave-3.6.4.orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi
---- octave-3.6.4.orig/doc/interpreter/audio.texi 2013-02-21 21:37:50.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/audio.texi 2013-07-14 17:51:09.075416914 +0200
-@@ -146,18 +146,22 @@
- Load the RIFF/WAVE sound file @var{filename}, and return the samples
- in vector @var{y}. If the file contains multichannel data, then
- @var{y} is a matrix with the channels represented as columns.
-+@end deftypefn
-
--@deftypefnx {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
-+@deftypefn {Function File} {[@var{y}, @var{Fs}, @var{bps}] =} wavread (@var{filename})
- Additionally return the sample rate (@var{fs}) in Hz and the number of bits
- per sample (@var{bps}).
-+@end deftypefn
-
--@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
-+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n})
- Read only the first @var{n} samples from each channel.
-+@end deftypefn
-
--@deftypefnx {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
-+@deftypefn {Function File} {[@dots{}] =} wavread (@var{filename}, @var{n1} @var{n2})
- Read only samples @var{n1} through @var{n2} from each channel.
-+@end deftypefn
-
--@deftypefnx {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
-+@deftypefn {Function File} {[@var{samples}, @var{channels}] =} wavread (@var{filename}, "size")
- Return the number of samples (@var{n}) and channels (@var{ch})
- instead of the audio data.
- @seealso{@ref{doc-wavwrite,,wavwrite}}
-diff -ur octave-3.6.4.orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi
---- octave-3.6.4.orig/doc/interpreter/plot.texi 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/plot.texi 2013-07-14 17:49:17.127729719 +0200
-@@ -2707,17 +2707,21 @@
- Set the data aspect ratio of the current axes. The aspect ratio is
- a normalized 3-element vector representing the span of the x, y, and
- z-axes limits.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{data_aspect_ratio} =} daspect ( )
-+@deftypefn {Function File} {@var{data_aspect_ratio} =} daspect ( )
- Return the data aspect ratio of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {} daspect (@var{mode})
-+@deftypefn {Function File} {} daspect (@var{mode})
- Set the data aspect ratio mode of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
-+@deftypefn {Function File} {@var{data_aspect_ratio_mode} =} daspect ("mode")
- Return the data aspect ratio mode of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {} daspect (@var{hax}, @dots{})
-+@deftypefn {Function File} {} daspect (@var{hax}, @dots{})
- Use the axes, with handle @var{hax}, instead of the current axes.
-
- @seealso{@ref{doc-axis,,axis}, @ref{doc-pbaspect,,pbaspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
-@@ -2730,17 +2734,21 @@
- Set the plot box aspect ratio of the current axes. The aspect ratio
- is a normalized 3-element vector representing the rendered lengths of
- the x, y, and z-axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
-+@deftypefn {Function File} {@var{plot_box_aspect_ratio} =} pbaspect ( )
- Return the plot box aspect ratio of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {} pbaspect (@var{mode})
-+@deftypefn {Function File} {} pbaspect (@var{mode})
- Set the plot box aspect ratio mode of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
-+@deftypefn {Function File} {@var{plot_box_aspect_ratio_mode} =} pbaspect ("mode")
- Return the plot box aspect ratio mode of the current axes.
-+@end deftypefn
-
--@deftypefnx {Function File} {} pbaspect (@var{hax}, @dots{})
-+@deftypefn {Function File} {} pbaspect (@var{hax}, @dots{})
- Use the axes, with handle @var{hax}, instead of the current axes.
-
- @seealso{@ref{doc-axis,,axis}, @ref{doc-daspect,,daspect}, @ref{doc-xlim,,xlim}, @ref{doc-ylim,,ylim}, @ref{doc-zlim,,zlim}}
-@@ -3147,7 +3155,7 @@
- @item "hide"
- Hide legend on the plot
-
--@itemx "toggle"
-+@item "toggle"
- Toggles between "hide" and "show"
-
- @item "boxon"
-@@ -3162,7 +3170,7 @@
- @item "right"
- Place text to the right of the keys
-
--@itemx "off"
-+@item "off"
- Delete the legend object
- @end table
- @end deftypefn
-@@ -4139,11 +4147,11 @@
- is sent to a file the size is determined by the plot box defined by
- the figure's "paperposition" property.
-
--@itemx -append
-+@item -append
- Appends the PS, or PDF output to a pre-existing file of the
- same type.
-
--@itemx -r@var{NUM}
-+@item -r@var{NUM}
- Resolution of bitmaps in pixels per inch. For both metafiles and
- SVG the default is the screen resolution, for other it is 150 dpi.
- To specify screen resolution, use "-r0".
-@@ -6296,15 +6304,15 @@
- A character indicating a plot marker to be place at each data point, or
- @code{"none"}, meaning no markers should be displayed.
-
--@itemx markeredgecolor
-+@item markeredgecolor
- The color of the edge around the marker, or @code{"auto"}, meaning that
- the edge color is the same as the face color. @xref{Colors}.
-
--@itemx markerfacecolor
-+@item markerfacecolor
- The color of the marker, or @code{"none"} to indicate that the marker
- should not be filled. @xref{Colors}.
-
--@itemx markersize
-+@item markersize
- A number specifying the size of the marker. The default is 1. A value
- of 2 is twice as large as the default, etc.
- @end table
-@@ -6442,7 +6450,8 @@
- @deftypefn {Function File} {@var{value} =} getappdata (@var{h}, @var{name})
- Return the @var{value} for named application data for the object(s) with
- handle(s) @var{h}.
--@deftypefnx {Function File} {@var{appdata} =} getappdata (@var{h})
-+@end deftypefn
-+@deftypefn {Function File} {@var{appdata} =} getappdata (@var{h})
- Return a structure, @var{appdata}, whose fields correspond to the appdata
- properties.
- @end deftypefn
-diff -ur octave-3.6.4.orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi
---- octave-3.6.4.orig/doc/interpreter/poly.texi 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/poly.texi 2013-07-14 17:50:09.984878151 +0200
-@@ -82,8 +82,9 @@
- (@var{x}-@var{mu}(1))/@var{mu}(2).
- If @var{x} is a vector or matrix, the polynomial is evaluated for each of
- the elements of @var{x}.
-+@end deftypefn
-
--@deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
-+@deftypefn {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s})
- @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu})
- In addition to evaluating the polynomial, the second output
- represents the prediction interval, @var{y} +/- @var{dy}, which
-diff -ur octave-3.6.4.orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi
---- octave-3.6.4.orig/doc/interpreter/set.texi 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/set.texi 2013-07-14 17:49:52.361384171 +0200
-@@ -150,8 +150,9 @@
- 3 4
- @end group
- @end example
-+@end deftypefn
-
--@deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
-+@deftypefn {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@var{a}, @var{b})
-
- Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and
- @code{b(ib)} are disjoint sets whose union is @var{c}.
-diff -ur octave-3.6.4.orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi
---- octave-3.6.4.orig/doc/interpreter/signal.texi 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/signal.texi 2013-07-14 17:50:42.388506903 +0200
-@@ -454,17 +454,20 @@
-
- For fastest computation, @var{n} should factor into a small number of
- small primes.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
-+@deftypefn {Function File} {@var{h} =} freqz (@var{b}, @var{a}, @var{w})
- Evaluate the response at the specific frequencies in the vector @var{w}.
- The values for @var{w} are measured in radians.
-+@end deftypefn
-
--@deftypefnx {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
-+@deftypefn {Function File} {[@dots{}] =} freqz (@dots{}, @var{Fs})
- Return frequencies in Hz instead of radians assuming a sampling rate
- @var{Fs}. If you are evaluating the response at specific frequencies
- @var{w}, those frequencies should be requested in Hz rather than radians.
-+@end deftypefn
-
--@deftypefnx {Function File} {} freqz (@dots{})
-+@deftypefn {Function File} {} freqz (@dots{})
- Plot the pass band, stop band and phase response of @var{h} rather
- than returning them.
- @end deftypefn
-diff -ur octave-3.6.4.orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi
---- octave-3.6.4.orig/doc/interpreter/system.texi 2013-02-21 21:37:52.000000000 +0100
-+++ octave-3.6.4/doc/interpreter/system.texi 2013-07-14 17:53:07.136493915 +0200
-@@ -1261,9 +1261,9 @@
- interpreted as filename globbing patterns (as they are used by Unix shells).
- Within a pattern
- @table @code
--@itemx *
-+@item *
- matches any string, including the null string,
--@itemx ?
-+@item ?
- matches any single character, and
-
- @item [@dots{}]
-@@ -2789,8 +2789,9 @@
- Display a header containing the current Octave version number, license
- string and operating system, followed by the installed package names,
- versions, and installation directories.
-+@end deftypefn
-
--@deftypefnx {Function File} {v =} ver ()
-+@deftypefn {Function File} {v =} ver ()
- Return a vector of structures, respecting Octave and each installed package.
- The structure includes the following fields.
-
-@@ -2807,11 +2808,13 @@
- @item Date
- Date respecting the version/revision.
- @end table
-+@end deftypefn
-
--@deftypefnx {Function File} {v =} ver ("Octave")
-+@deftypefn {Function File} {v =} ver ("Octave")
- Return version information for Octave only.
-+@end deftypefn
-
--@deftypefnx {Function File} {v =} ver (@var{package})
-+@deftypefn {Function File} {v =} ver (@var{package})
- Return version information for @var{package}.
-
- @seealso{@ref{doc-version,,version}, @ref{doc-octave_config_info,,octave_config_info}}
-@@ -2878,19 +2881,23 @@
- @anchor{doc-license}
- @deftypefn {Function File} {} license
- Display the license of Octave.
-+@end deftypefn
-
--@deftypefnx {Function File} {} license ("inuse")
-+@deftypefn {Function File} {} license ("inuse")
- Display a list of packages currently being used.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{retval} =} license ("inuse")
-+@deftypefn {Function File} {@var{retval} =} license ("inuse")
- Return a structure containing the fields @code{feature} and @code{user}.
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{retval} =} license ("test", @var{feature})
-+@deftypefn {Function File} {@var{retval} =} license ("test", @var{feature})
- Return 1 if a license exists for the product identified by the string
- @var{feature} and 0 otherwise. The argument @var{feature} is case
- insensitive and only the first 27 characters are checked.
-+@end deftypefn
-
--@deftypefnx {Function File} {} license ("test", @var{feature}, @var{toggle})
-+@deftypefn {Function File} {} license ("test", @var{feature}, @var{toggle})
- Enable or disable license testing for @var{feature}, depending on
- @var{toggle}, which may be one of:
-
-@@ -2902,8 +2909,9 @@
- @item "disable"
- Future tests for the specified license of @var{feature} return 0.
- @end table
-+@end deftypefn
-
--@deftypefnx {Function File} {@var{retval} =} license ("checkout", @var{feature})
-+@deftypefn {Function File} {@var{retval} =} license ("checkout", @var{feature})
- Check out a license for @var{feature}, returning 1 on success and 0
- on failure.
-
-diff -ur octave-3.6.4.orig/doc/liboctave/liboctave.texi octave-3.6.4/doc/liboctave/liboctave.texi
---- octave-3.6.4.orig/doc/liboctave/liboctave.texi 2013-07-14 17:27:13.955663003 +0200
-+++ octave-3.6.4/doc/liboctave/liboctave.texi 2013-07-14 17:58:05.292550399 +0200
-@@ -81,10 +81,10 @@
- @end ifnottex
-
- @titlepage
--@title{Octave C++ Classes}
--@subtitle{Edition 1.0 for Octave version @value{VERSION}}
--@subtitle{September 1993}
--@author{John W. Eaton}
-+@title Octave C++ Classes
-+@subtitle Edition 1.0 for Octave version @value{VERSION}
-+@subtitle September 1993
-+@author John W. Eaton
- @page
- @vskip 0pt plus 1filll
- Copyright @copyright{} 1996, 1997 John W. Eaton.
+# TODO:
+# - separate -gui parts, maybe java
+# - update dependencies
Summary: GNU Octave - a high-level language for numerical computations
Summary(cs.UTF-8): GNU Octave - vyšší programovací jazyk pro numerické výpočty
Summary(da.UTF-8): GNU Octave - et højniveausprog for numeriske beregninger
Summary(sv.UTF-8): GNU Octave - ett högninvåspråk för numeriska beräkningar
Summary(zh_CN.UTF-8): GNU Octave - 用于数字计算的高级语言。
Name: octave
-Version: 3.6.4
-Release: 4
+Version: 3.8.1
+Release: 0.1
Epoch: 2
License: GPL v3+
Group: Applications/Math
Source0: http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
-# Source0-md5: e0d3e5e3d38a66d3f8593ba065c6e2fd
+# Source0-md5: 4c5b9bd6b82b7fa3191af9706e7204f8
Source1: %{name}.desktop
Patch0: %{name}-info.patch
Patch1: %{name}-build.patch
-Patch2: %{name}-header.patch
URL: http://www.octave.org/
BuildRequires: AMD-devel
BuildRequires: CAMD-devel
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
%{__autoconf}
%{__autoheader}
%{__automake}
-# rebuild fails with "./octave.texi:130: Missing number, treated as zero."
-# so use hacks to avoid it (note: it must be done after configure regeneration)
-touch doc/interpreter/{version.texi,stamp-vti}
-touch doc/interpreter/octave.{dvi,ps,pdf}
+# to find local sources
+export CLASSPATH=.
+# Note: configure defaults to {moc,uic,rcc,lrelease}-qt5 tools,
+# but gets only qt4 (QtCore, QtGui, QtNetwork) libraries;
+# pass qt4 tools for consistency (qt5 tools refer to e.g. Qt5 specific headers)
%configure \
+ MOC=moc-qt4 \
+ UIC=uic-qt4 \
+ RCC=rcc \
+ LRELEASE=lrelease-qt4 \
--with-amd-includedir=%{_includedir}/amd \
--with-camd-includedir=%{_includedir}/camd \
--with-cholmod-includedir=%{_includedir}/cholmod \
%files
%defattr(644,root,root,755)
%doc AUTHORS BUGS ChangeLog NEWS README
-%doc examples doc/{faq,interpreter}/*.{html,pdf} doc/refcard/refcard-a4.pdf
+%doc examples doc/interpreter/*.{html,pdf} doc/refcard/refcard-a4.pdf
%attr(755,root,root) %{_bindir}/mkoctfile
%attr(755,root,root) %{_bindir}/mkoctfile-%{version}
%attr(755,root,root) %{_bindir}/octave
%attr(755,root,root) %{_bindir}/octave-%{version}
-%attr(755,root,root) %{_libdir}/libcruft.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcruft.so.1
+%attr(755,root,root) %{_bindir}/octave-cli
+%attr(755,root,root) %{_bindir}/octave-cli-%{version}
%attr(755,root,root) %{_libdir}/liboctave.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctave.so.1
+%attr(755,root,root) %ghost %{_libdir}/liboctave.so.2
+%attr(755,root,root) %{_libdir}/liboctgui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboctgui.so.0
%attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.1
+%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.2
%{_libdir}/octave
%{_infodir}/octave.info*
-%{_infodir}/OctaveFAQ.info*
%{_mandir}/man1/mkoctfile.1*
%{_mandir}/man1/octave.1*
+%{_mandir}/man1/octave-cli.1*
%{_datadir}/octave
%{_desktopdir}/octave.desktop
%doc doc/liboctave/liboctave.{html,pdf}
%attr(755,root,root) %{_bindir}/octave-config
%attr(755,root,root) %{_bindir}/octave-config-%{version}
-%attr(755,root,root) %{_libdir}/libcruft.so
%attr(755,root,root) %{_libdir}/liboctave.so
+%attr(755,root,root) %{_libdir}/liboctgui.so
%attr(755,root,root) %{_libdir}/liboctinterp.so
%{_includedir}/%{name}*
%{_mandir}/man1/octave-config.1*
projects / packages / octave.git / commitdiff