rpms/escape/devel escape-gcc43.patch,NONE,1.1 escape.spec,1.9,1.10

Adam Goode (agoode) fedora-extras-commits at redhat.com
Mon Feb 4 00:00:48 UTC 2008


Author: agoode

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

Modified Files:
	escape.spec 
Added Files:
	escape-gcc43.patch 
Log Message:
* Sun Feb  3 2008 Adam Goode <adam at spicenitz.org> - 200704130-8
- GCC 4.3 fix


escape-gcc43.patch:

--- NEW FILE escape-gcc43.patch ---
Index: level.h
===================================================================
RCS file: /cvsroot/tom7misc/escapex/level.h,v
retrieving revision 1.56
diff -u -3 -p -r1.56 level.h
--- level.h	11 Jan 2007 22:42:40 -0000	1.56
+++ level.h	3 Feb 2008 23:50:19 -0000
@@ -3,6 +3,7 @@
 #define __LEVEL_H
 
 #include <string>
+#include <string.h>
 
 using namespace std;
 
Index: util.cpp
===================================================================
RCS file: /cvsroot/tom7misc/escapex/util.cpp,v
retrieving revision 1.64
diff -u -3 -p -r1.64 util.cpp
--- util.cpp	5 Apr 2007 21:41:23 -0000	1.64
+++ util.cpp	3 Feb 2008 23:50:19 -0000
@@ -1,5 +1,6 @@
 
 #include <sys/stat.h>
+#include <string.h>
 
 #include "util.h"
 #include "extent.h"
Index: util.h
===================================================================
RCS file: /cvsroot/tom7misc/escapex/util.h,v
retrieving revision 1.59
diff -u -3 -p -r1.59 util.h
--- util.h	5 Apr 2007 21:41:23 -0000	1.59
+++ util.h	3 Feb 2008 23:50:19 -0000
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <string>
+#include <stdlib.h>
 
 using namespace std;
 


Index: escape.spec
===================================================================
RCS file: /cvs/extras/rpms/escape/devel/escape.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- escape.spec	6 Dec 2007 02:20:56 -0000	1.9
+++ escape.spec	4 Feb 2008 00:00:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		escape
 Version:	200704130
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A fun puzzle game in the tradition of Adventures of Lolo or Chip's Challenge
 
 Group:		Amusements/Games
@@ -11,6 +11,7 @@
 Source1:	%{name}.desktop
 
 Patch0:		escape-200704130-update-remove.patch
+Patch1:		escape-gcc43.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +37,9 @@
 # fix update bug
 %patch -P 0 -p1 -b .update-remove
 
+# gcc 4.3 patch
+%patch -P 1 -p0 -b .gcc43
+
 # fix permissions for debuginfo packages
 find . \( -name '*.h' -o -name '*.cpp' \) -type f -print0 | xargs -0 chmod 0644
 
@@ -98,6 +102,9 @@
 
 
 %changelog
+* Sun Feb  3 2008 Adam Goode <adam at spicenitz.org> - 200704130-8
+- GCC 4.3 fix
+
 * Wed Dec  5 2007 Adam Goode <adam at spicenitz.org> - 200704130-7
 - Fix desktop file validation
 




More information about the fedora-extras-commits mailing list