rpms/octave/devel octave-2.9.5-lex.patch, NONE, 1.1 octave.spec, 1.37, 1.38

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10116

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-lex.patch 
Log Message:
Bug fix and spec file changes.

octave-2.9.5-lex.patch:

--- NEW FILE octave-2.9.5-lex.patch ---
src/ChangeLog:

2006-05-02  John W. Eaton  <jwe at octave.org>

	* lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token.


Index: src/lex.l
===================================================================
RCS file: /cvs/octave/src/lex.l,v
retrieving revision 1.232
diff -u -r1.232 lex.l
--- src/lex.l	24 Apr 2006 19:13:08 -0000	1.232
+++ src/lex.l	2 May 2006 23:31:14 -0000
@@ -696,7 +696,10 @@
       BEGIN (INITIAL);
 
     if (nesting_level.none ())
-      COUNT_TOK_AND_RETURN ('\n');
+      {
+	lexer_flags.doing_rawcommand = false;
+	COUNT_TOK_AND_RETURN ('\n');
+      }
     else if (nesting_level.is_bracket_or_brace ())
       COUNT_TOK_AND_RETURN (';');
   }


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- octave.spec	19 Apr 2006 16:51:35 -0000	1.37
+++ octave.spec	3 May 2006 14:16:04 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -9,6 +9,7 @@
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.5-sparse.patch
 Patch1:         octave-2.9.5-config.patch
+Patch2:         octave-2.9.5-lex.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -53,6 +54,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 
 %build
@@ -69,7 +71,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 # Make library links
@@ -135,6 +136,10 @@
 
 
 %changelog
+* Wed Apr 27 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-6
+- Add patch for bug #190481
+- Manual stripping of .oct files is no longer necessary.
+
 * Wed Apr 19 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-5
 - Add new patch to configure script (breaks octave-forge without it).