- merged two *.info patches and one more fix into single info patch

- release 10

Changed files:
    octave-Octave-FAQ.info.patch -> 1.3
    octave-info.patch -> 1.1
    octave-liboctave.info.patch -> 1.4
    octave.spec -> 1.48

diff --git a/octave-Octave-FAQ.info.patch b/octave-Octave-FAQ.info.patch
deleted file mode 100644 (file)
index 9729c77..0000000
--- a/octave-Octave-FAQ.info.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- octave-2.0.14/doc/faq/Octave-FAQ.texi      Sat Feb 14 07:54:44 1998
-+++ Octave-FAQ.texi    Tue May 11 15:37:00 1999
-@@ -1,6 +1,18 @@
- \input texinfo.tex      @c -*-texinfo-*-
- 
- @setfilename Octave-FAQ.info
-+@ifinfo
-+@format
-+@dircategory Libraries:
-+@direntry
-+* Octave-FAQ: (Octave-FAQ).           Frequently asked questions 
-+                                      about Octave (with answers)     
-+@end direntry
-+@end format
-+@end ifinfo
-+
-+
-+
- @settitle Frequently asked questions about Octave (with answers)
- 
- @setchapternewpage off

diff --git a/octave-info.patch b/octave-info.patch
new file mode 100644 (file)
index 0000000..ebb9be2
--- /dev/null
+++ b/octave-info.patch
@@ -0,0 +1,56 @@
+diff -Nur octave-2.1.36.orig/doc/faq/Octave-FAQ.texi octave-2.1.36/doc/faq/Octave-FAQ.texi
+--- octave-2.1.36.orig/doc/faq/Octave-FAQ.texi Fri Nov  2 06:11:44 2001
++++ octave-2.1.36/doc/faq/Octave-FAQ.texi      Sat Nov  2 11:47:46 2002
+@@ -1,6 +1,16 @@
+ \input texinfo.tex      @c -*-texinfo-*-
+ 
+ @setfilename Octave-FAQ.info
++
++@ifinfo
++@format
++@dircategory Programming Languages:
++@direntry
++* Octave-FAQ: (Octave-FAQ).           Frequently asked questions about Octave (with answers)
++@end direntry
++@end format
++@end ifinfo
++
+ @settitle Frequently asked questions about Octave (with answers)
+ 
+ @setchapternewpage off
+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
+@@ -15,9 +15,10 @@
+ 
+ @ifinfo
+ @format
+-START-INFO-DIR-ENTRY
+-* Octave: (octave).   Interactive language for numerical computations.
+-END-INFO-DIR-ENTRY
++@dircategory Programming Languages:
++@direntry
++* Octave: (octave).                   Interactive language for numerical computations
++@end direntry
+ @end format
+ @end ifinfo
+ 
+diff -Nur octave-2.1.36.orig/doc/liboctave/liboctave.texi octave-2.1.36/doc/liboctave/liboctave.texi
+--- octave-2.1.36.orig/doc/liboctave/liboctave.texi    Wed Mar  8 10:30:06 2000
++++ octave-2.1.36/doc/liboctave/liboctave.texi Sat Nov  2 11:48:30 2002
+@@ -5,6 +5,15 @@
+ \input texinfo  @c -*-texinfo-*-
+ @setfilename liboctave.info
+ 
++@ifinfo
++@format
++@dircategory Libraries:
++@direntry
++* Liboctave: (liboctave).             Octave C++ Class Library
++@end direntry
++@end format
++@end ifinfo
++
+ @c @smallbook
+ @c @setchapternewpage odd
+ @c @cropmarks

diff --git a/octave-liboctave.info.patch b/octave-liboctave.info.patch
deleted file mode 100644 (file)
index 674e68d..0000000
--- a/octave-liboctave.info.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- octave-2.0.14/doc/liboctave/liboctave.texi Tue Aug 18 21:49:42 1998
-+++ liboctave.texi     Mon May 10 22:59:01 1999
-@@ -5,6 +5,15 @@
- \input texinfo  @c -*-texinfo-*-
- @setfilename liboctave.info
- 
-+@ifinfo
-+@format
-+@dircategory Libraries:
-+@direntry
-+* Liboctave: (liboctave).             Octave C++ Class Library
-+@end direntry
-+@end format
-+@end ifinfo
-+
- @c @smallbook
- @c @setchapternewpage odd
- @c @cropmarks

diff --git a/octave.spec b/octave.spec
index b822196cefd41ad978cfb512f3ece80decfee41a..36a18e98789112f44ee64b96a6e45d1f2d06a58f 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -4,14 +4,13 @@ Summary(pl):  GNU Octave -- j
 Summary(pt_BR):        GNU Octave - Um programa para cálculo numérico e matricial
 Name:          octave
 Version:       2.1.36
-Release:       9
+Release:       10
 License:       GPL
 Group:         Applications/Math
 Source0:       ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-lib%{name}.info.patch
-Patch1:                %{name}-Octave-FAQ.info.patch
-Patch2:                %{name}-DESTDIR.patch
-Patch3:                %{name}-gcc31.patch
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-DESTDIR.patch
+Patch2:                %{name}-gcc31.patch
 URL:           http://www.che.wisc.edu/octave/
 BuildRequires: bison
 BuildRequires: blas-devel
@@ -23,6 +22,7 @@ BuildRequires:        lapack-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: readline-devel
+BuildRequires: texinfo
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
 Requires:      gnuplot
@@ -86,9 +86,8 @@ Tryb edycji plik
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure \