- updated to 2.1.50, removed obsolete DESTDIR and gcc33 patches

Changed files:
    octave-DESTDIR.patch -> 1.4
    octave-gcc33.patch -> 1.2
    octave.spec -> 1.57

diff --git a/octave-DESTDIR.patch b/octave-DESTDIR.patch
deleted file mode 100644 (file)
index 2d7a983..0000000
--- a/octave-DESTDIR.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makeconf.in.orig   Mon Jul 23 16:57:13 2001
-+++ Makeconf.in        Mon Jul 23 16:57:16 2001
-@@ -160,20 +160,20 @@
- # subdirectories of this directory.  The default values for many of
- # the variables below are expressed in terms of this one, so you may
- # not need to change them.  This defaults to /usr/local.
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- 
- # Like `prefix', but used for architecture-specific files.
--exec_prefix = @exec_prefix@
-+exec_prefix = $(DESTDIR)@exec_prefix@
- 
- # Where to install Octave and other binaries that people will want to
- # run directly.
--bindir = @bindir@
-+bindir = $(DESTDIR)@bindir@
- 
- # Where to install architecture-independent data files.  ${fcnfiledir}
- # and ${localfcnfiledir} are subdirectories of this.
--datadir = @datadir@
-+datadir = $(DESTDIR)@datadir@
- 
--libdir = @libdir@
-+libdir = $(DESTDIR)@libdir@
- 
- # Where to install and expect libraries like libcruft.a, liboctave.a,
- # and other architecture-dependent data.
-@@ -181,20 +181,20 @@
- 
- # Where to install and expect executable programs to be run by Octave
- # rather than directly by users.
--libexecdir = @libexecdir@
-+libexecdir = $(DESTDIR)@libexecdir@
- 
- # The prefix for Octave's include file directory.  The default is
- # ${prefix}/include
--includedir = @includedir@
-+includedir = $(DESTDIR)@includedir@
- 
- # Where to install Octave's man pages, and what extension they should
- # have.  The default is ${prefix}/man/man1
--mandir = @mandir@
-+mandir = $(DESTDIR)@mandir@
- man1dir = @man1dir@
- man1ext = @man1ext@
- 
- # Where to install and expect the info files describing Octave..
--infodir = @infodir@
-+infodir = $(DESTDIR)@infodir@
- 
- # The fill path to the default info file.
- infofile = @infofile@

diff --git a/octave-gcc33.patch b/octave-gcc33.patch
deleted file mode 100644 (file)
index 068ec52..0000000
--- a/octave-gcc33.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- octave-2.1.48/src/ov-cx-mat.h.orig 2002-11-20 20:03:08.000000000 +0100
-+++ octave-2.1.48/src/ov-cx-mat.h      2003-05-17 20:34:16.000000000 +0200
-@@ -78,8 +78,7 @@
- 
-   octave_value *try_narrowing_conversion (void);
- 
--  void assign (const octave_value_list& idx, const ComplexMatrix& rhs)
--    { octave_base_matrix<ComplexMatrix>::assign (idx, rhs); }
-+  void assign (const octave_value_list& idx, const ComplexMatrix& rhs);
- 
-   void assign (const octave_value_list& idx, const Matrix& rhs);
- 
---- octave-2.1.48/src/ov-cx-mat.cc.orig        2002-11-20 20:03:08.000000000 +0100
-+++ octave-2.1.48/src/ov-cx-mat.cc     2003-05-17 20:35:56.000000000 +0200
-@@ -78,6 +78,11 @@
- 
- void
- octave_complex_matrix::assign (const octave_value_list& idx,
-+                             const ComplexMatrix& rhs)
-+{ octave_base_matrix<ComplexMatrix>::assign (idx, rhs); }
-+
-+void
-+octave_complex_matrix::assign (const octave_value_list& idx,
-                              const Matrix& rhs)
- {
-   int len = idx.length ();

diff --git a/octave.spec b/octave.spec
index 1a3a5124b463f7763de7b1599824ad6af07bfd41..fa727e933451d3b84d6b1d2f463fa4d048ac37dd 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -15,17 +15,15 @@ Summary(ru):        GNU Octave - 
 Summary(sv):   GNU Octave - ett högninvåspråk för numeriska beräkningar
 Summary(zh_CN):        GNU Octave - ÓÃÓÚÊý×Ö¼ÆËãµÄ¸ß¼¶ÓïÑÔ¡£
 Name:          octave
-Version:       2.1.48
+Version:       2.1.50
 Release:       1
 Epoch:         2
 License:       GPL
 Group:         Applications/Math
 Source0:       ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/%{name}-%{version}.tar.bz2
-# Source0-md5: 9e5234e9f00216b087f1e2fb465ed0cd
+# Source0-md5: 480d48cd99828fb403ceee53dd1cad2f
 Source1:       %{name}.desktop
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-DESTDIR.patch
-Patch2:                %{name}-gcc33.patch
 URL:           http://www.che.wisc.edu/octave/
 BuildRequires: bison
 BuildRequires: blas-devel
@@ -257,8 +255,6 @@ Tryb edycji plik
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
 
 %build
 %configure \
@@ -280,8 +276,8 @@ install -d $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Numerics
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       octincludedir=$RPM_BUILD_ROOT%{_includedir} \
-       octlibdir=$RPM_BUILD_ROOT%{_libdir}
+       octincludedir=%{_includedir} \
+       octlibdir=%{_libdir}
 
 ln -sf %{_includedir}/%{name} $RPM_BUILD_ROOT%{_includedir}/%{name}-%{version}