- started update to 4.0.0

diff --git a/octave-texinfo6.patch b/octave-texinfo6.patch
new file mode 100644 (file)
index 0000000..5e3961f
--- /dev/null
+++ b/octave-texinfo6.patch
@@ -0,0 +1,48 @@
+diff -up octave-4.0.0/doc/liboctave/Makefile.in.texinfo6 octave-4.0.0/doc/liboctave/Makefile.in
+--- octave-4.0.0/doc/liboctave/Makefile.in.texinfo6    2015-05-26 10:21:42.000000000 -0600
++++ octave-4.0.0/doc/liboctave/Makefile.in     2015-07-14 10:40:50.131788830 -0600
+@@ -1854,7 +1854,6 @@ localstartupfiledir = ${localfcnfiledir}
+ # The separator used for elements of the LD_PRELOAD variable (might be
+ # a space, so protect with $(null))
+ null = 
+-TEXINFO_TEX = ../texinfo.tex
+ info_TEXINFOS = liboctave.texi
+ liboctave_TEXINFOS = \
+   array.texi \
+diff -up octave-4.0.0/libinterp/corefcn/utils.cc.texinfo6 octave-4.0.0/libinterp/corefcn/utils.cc
+--- octave-4.0.0/libinterp/corefcn/utils.cc.texinfo6   2015-05-23 08:21:53.000000000 -0600
++++ octave-4.0.0/libinterp/corefcn/utils.cc    2015-07-14 09:46:17.300468145 -0600
+@@ -22,7 +22,7 @@ along with Octave; see the file COPYING.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+-#include <config.h>
++#include "config.h"
+ #endif
+ 
+ #include <cerrno>
+@@ -1379,7 +1379,7 @@ indexing using @var{ind} will not perfor
+ \n\
+ Implementation Note: Strings are first converted to double values before the\n\
+ checks for valid indices are made.  Unless a string contains the NULL\n\
+-character @nospell{\"\\0\"}, it will always be a valid index.\n\
++character @nospell{\"@xbackslashchar{}0\"}, it will always be a valid index.\n\
+ @end deftypefn")
+ {
+   octave_value retval;
+diff -up octave-4.0.0/scripts/io/beep.m.texinfo6 octave-4.0.0/scripts/io/beep.m
+--- octave-4.0.0/scripts/io/beep.m.texinfo6    2015-05-23 08:21:53.000000000 -0600
++++ octave-4.0.0/scripts/io/beep.m     2015-07-14 09:46:16.894469886 -0600
+@@ -20,9 +20,9 @@
+ ## @deftypefn {Function File} {} beep ()
+ ## Produce a beep from the speaker (or visual bell).
+ ##
+-## This function sends the alarm character @qcode{"\a"} to the terminal.
+-## Depending on the user's configuration this may produce an audible beep,
+-## a visual bell, or nothing at all.
++## This function sends the alarm character @qcode{"@xbackslashchar{}a"} to
++## the terminal. Depending on the user's configuration this may produce an
++## audible beep, a visual bell, or nothing at all.
+ ## @seealso{puts, fputs, printf, fprintf}
+ ## @end deftypefn
+ 

diff --git a/octave.spec b/octave.spec
index a1b620e86cbd3824b99444c17a90afd266f064ea..3e21897bc9cfbc2bc11bd3a3536efce7b94c4cfc 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -22,17 +22,18 @@ Summary(ru.UTF-8):  GNU Octave - Язык высокого уровня для в
 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.8.2
-Release:       4
+Version:       4.0.0
+Release:       0.1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Math
-Source0:       http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
-# Source0-md5: 188bd97e22054f9c62701ee0e6800dc1
+Source0:       http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.xz
+# Source0-md5: f3de0a0d9758e112f13ce1f5eaf791bf
 Source1:       %{name}.desktop
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-build.patch
 Patch2:                %{name}-suitesparse.patch
+Patch3:                %{name}-texinfo6.patch
 URL:           http://www.octave.org/
 BuildRequires: AMD-devel >= 2.4.0
 BuildRequires: CAMD-devel
@@ -324,7 +325,8 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}