rpms/csmash/devel csmash-0.6.6-64bit-gcc4-fixes.patch, 1.1, 1.2 csmash.spec, 1.8, 1.9

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	csmash-0.6.6-64bit-gcc4-fixes.patch csmash.spec 
Log Message:
Further x86_64/gcc4 fixes.


csmash-0.6.6-64bit-gcc4-fixes.patch:

Index: csmash-0.6.6-64bit-gcc4-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash-0.6.6-64bit-gcc4-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- csmash-0.6.6-64bit-gcc4-fixes.patch	3 May 2005 11:05:18 -0000	1.1
+++ csmash-0.6.6-64bit-gcc4-fixes.patch	24 May 2005 17:06:14 -0000	1.2
@@ -51,3 +51,14 @@
  		det = -det;
  	    }
  	    u = a[ik][k];
+--- csmash-0.6.6/loadparts.cpp.gcc4	2005-05-10 05:02:47.000000000 -0400
++++ csmash-0.6.6/loadparts.cpp	2005-05-10 05:03:03.000000000 -0400
+@@ -245,7 +245,7 @@
+ 
+ 	while ('\\' == line[l-1]) {
+             // concat next line(s)
+-	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++	    int bufsize = clamp((size_t)0U, sizeof(line)-l, sizeof(line)-1);
+ 	    fgets(&line[l-2], bufsize, fp);
+ 	    if (feof((FILE*)fp)) break;
+ 	    l = strlen(line);


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- csmash.spec	22 May 2005 22:27:51 -0000	1.8
+++ csmash.spec	24 May 2005 17:06:14 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 8
+Release: 9
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue May 24 2005 Matthias Saou <http://freshrpms.net/> 0.6.6-9
+- Update the gcc4 patch with diff from bug #156205.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.6.6-8
 - rebuild on all arches