rpms/glob2/devel glob2-gcc43.patch, NONE, 1.1 glob2.desktop, 1.1, 1.2 glob2.spec, 1.5, 1.6

Rafał Psota (rafalzaq) fedora-extras-commits at redhat.com
Thu Feb 14 17:39:18 UTC 2008


Author: rafalzaq

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

Modified Files:
	glob2.desktop glob2.spec 
Added Files:
	glob2-gcc43.patch 
Log Message:
gcc 4.3 patch

glob2-gcc43.patch:

--- NEW FILE glob2-gcc43.patch ---
--- libgag/include/FileManager.h.orig	2007-09-02 05:15:23.000000000 +0200
+++ libgag/include/FileManager.h	2008-02-14 16:48:07.000000000 +0100
@@ -24,6 +24,7 @@
 #include <vector>
 #include <fstream>
 #include <string>
+#include <ctime>
 
 //! this is the host filesystem directory separator
 #ifndef DIR_SEPARATOR
--- libgag/src/FileManager.cpp.orig	2008-02-14 16:59:36.000000000 +0100
+++ libgag/src/FileManager.cpp	2008-02-14 16:58:46.000000000 +0100
@@ -32,6 +32,7 @@
 #include <zlib.h>
 #include "BinaryStream.h"
 #include "TextStream.h"
+#include <ctime>
 
 // here we handle compile time options
 #ifdef HAVE_CONFIG_H
--- src/AIEcho.cpp.orig	2007-09-02 05:15:03.000000000 +0200
+++ src/AIEcho.cpp	2008-02-14 17:26:24.000000000 +0100
@@ -30,6 +30,7 @@
 #include <iterator>
 #include "Utilities.h"
 #include "Brush.h"
+#include <limits>
 
 using namespace AIEcho;
 using namespace AIEcho::Gradients;
--- src/MultiplayerGameEvent.cpp.orig	2007-09-02 05:15:10.000000000 +0200
+++ src/MultiplayerGameEvent.cpp	2008-02-14 17:57:12.000000000 +0100
@@ -18,6 +18,7 @@
 
 #include "MultiplayerGameEvent.h"
 #include <sstream>
+#include <typeinfo>
 
 
 MGPlayerListChangedEvent::MGPlayerListChangedEvent()


Index: glob2.desktop
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glob2.desktop	8 Sep 2007 15:51:25 -0000	1.1
+++ glob2.desktop	14 Feb 2008 17:38:29 -0000	1.2
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=Globulation 2
 Comment=An innovative new strategy game
 Exec=glob2


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glob2.spec	16 Sep 2007 00:59:22 -0000	1.5
+++ glob2.spec	14 Feb 2008 17:38:29 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glob2
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 #patch0 fixes polish diacritics
 Patch0:         glob2-texts.pl.patch
 Patch1:         glob2-desktopfileinstall.patch
+Patch2:         glob2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 %if "%{?fedora}" > "7"
@@ -94,6 +96,8 @@
 
 
 %changelog
+* Thu Feb 14 2008 Rafał Psota <rafalzaq at gmail.com> - 0.9.1-3
+- gcc 4.3 patch
 * Sun Sep 16 2007 Rafał Psota <rafalzaq at gmail.com> - 0.9.1-2
 - new install method
 * Tue Sep 04 2007 Rafał Psota <rafalzaq at gmail.com> - 0.9.1-1




More information about the fedora-extras-commits mailing list