rpms/Macaulay2/devel Macaulay2-0.9.10-newline.patch, NONE, 1.1 Macaulay2.spec, 1.20, 1.21

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.10-newline.patch 
Log Message:
patch to fix gcc-4.1.x build


Macaulay2-0.9.10-newline.patch:

--- NEW FILE Macaulay2-0.9.10-newline.patch ---
--- Macaulay2-0.9.10/Macaulay2/e/text_io.hpp.newline	2006-07-12 14:04:29.000000000 -0500
+++ Macaulay2-0.9.10/Macaulay2/e/text_io.hpp	2006-07-12 14:04:31.000000000 -0500
@@ -12,7 +12,8 @@
 extern int p_parens;
 extern int i_text_io();
 
-extern "C" char newline[];
+// omit def here, already defined in M2types.h -- Rex
+//extern "C" char newline[];
 
 #define wrapping_prefix "   -- "
 


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Macaulay2.spec	12 Jul 2006 17:36:51 -0000	1.20
+++ Macaulay2.spec	12 Jul 2006 19:09:00 -0000	1.21
@@ -4,7 +4,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.10
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
@@ -21,6 +21,7 @@
 Patch1: Macaulay2-0.9.8-htmlview.patch
 Patch2: Macaulay2-0.9.10-cout.patch
 Patch3: Macaulay2-0.9.8-infodir.patch
+Patch4: Macaulay2-0.9.10-newline.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
@@ -76,6 +77,7 @@
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .cout
 %patch3 -p1 -b .infodir
+%patch4 -p1 -b .newline
 
 [ -f configure -a -f include/config.h ] || make 
 
@@ -155,7 +157,7 @@
 
 
 %changelog
-* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-0.3.20060710svn
+* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-0.4.20060710svn
 - 0.9.10
 
 -* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.6.cvs20060327