rpms/asc/devel asc-2.0.1.0-gcc43.patch,1.2,1.3 asc.spec,1.11,1.12
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Aug 26 14:33:23 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/asc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6868
Modified Files:
asc-2.0.1.0-gcc43.patch asc.spec
Log Message:
* Sun Aug 17 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 2.1.0.0-2
- Rebuild for new boost
asc-2.0.1.0-gcc43.patch:
Index: asc-2.0.1.0-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/asc-2.0.1.0-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asc-2.0.1.0-gcc43.patch 14 Apr 2008 19:41:34 -0000 1.2
+++ asc-2.0.1.0-gcc43.patch 26 Aug 2008 14:33:23 -0000 1.3
@@ -1,14 +1,15 @@
---- asc-2.0.1.0/source/ASCStringHelpers.h 2007-07-30 20:56:41.000000000 +0200
-+++ asc-2.0.1.0.new/source/ASCStringHelpers.h 2008-01-12 13:34:46.000000000 +0100
-@@ -7,6 +7,7 @@
- #include <cstdio>
+diff -up asc-2.1.0.0/source/ASCStringHelpers.h.foo asc-2.1.0.0/source/ASCStringHelpers.h
+--- asc-2.1.0.0/source/ASCStringHelpers.h.foo 2007-12-08 14:19:02.000000000 +0100
++++ asc-2.1.0.0/source/ASCStringHelpers.h 2008-08-17 10:46:06.000000000 +0200
+@@ -8,6 +8,7 @@
+ #include <cstring>
#include <memory>
#include <string>
+#include <cstring>
#include <wchar.h>
#include <stdio.h>
#include <ctype.h>
-@@ -205,9 +206,9 @@
+@@ -206,9 +207,9 @@ inline size_t ASCStringHelpers::_Strlen
assert ( pS != NULL );
#ifdef ASC_UNICODE
@@ -20,7 +21,7 @@
#endif
}
-@@ -231,9 +232,9 @@
+@@ -232,9 +233,9 @@ inline ASCStringHelpers::charT* ASCStrin
assert ( pDest != NULL );
#ifdef ASC_UNICODE
@@ -32,7 +33,7 @@
#endif
}
-@@ -352,9 +353,9 @@
+@@ -353,9 +354,9 @@ inline int ASCStringHelpers::_Stricmp (
#ifndef _UNIX_
#ifdef ASC_UNICODE
@@ -44,7 +45,7 @@
#endif
#else // _UNIX_
-@@ -373,9 +374,9 @@
+@@ -374,9 +375,9 @@ inline int ASCStringHelpers::_Stricmp (
_Strlwr ( l_pS1 );
_Strlwr ( l_pS2 );
@@ -56,8 +57,9 @@
#endif
#endif // _UNIX_
---- asc-2.0.1.0/source/dialogs/exchangegraphics.cpp 2007-04-12 22:53:24.000000000 +0200
-+++ asc-2.0.1.0.new/source/dialogs/exchangegraphics.cpp 2008-01-12 13:37:22.000000000 +0100
+diff -up asc-2.1.0.0/source/dialogs/exchangegraphics.cpp.foo asc-2.1.0.0/source/dialogs/exchangegraphics.cpp
+--- asc-2.1.0.0/source/dialogs/exchangegraphics.cpp.foo 2007-04-12 22:53:24.000000000 +0200
++++ asc-2.1.0.0/source/dialogs/exchangegraphics.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -15,6 +15,7 @@
* *
***************************************************************************/
@@ -66,8 +68,9 @@
#include <boost/regex.hpp>
#include "../paradialog.h"
---- asc-2.0.1.0/source/fieldimageloader.cpp 2007-10-10 21:39:28.000000000 +0200
-+++ asc-2.0.1.0.new/source/fieldimageloader.cpp 2008-01-12 13:43:31.000000000 +0100
+diff -up asc-2.1.0.0/source/fieldimageloader.cpp.foo asc-2.1.0.0/source/fieldimageloader.cpp
+--- asc-2.1.0.0/source/fieldimageloader.cpp.foo 2007-10-21 13:14:47.000000000 +0200
++++ asc-2.1.0.0/source/fieldimageloader.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -19,6 +19,7 @@
#include <algorithm>
#include <iostream>
@@ -76,8 +79,9 @@
#include <boost/regex.hpp>
#include "global.h"
---- asc-2.0.1.0/source/sdl/sound.cpp 2007-04-13 18:16:09.000000000 +0200
-+++ asc-2.0.1.0.new/source/sdl/sound.cpp 2008-01-12 12:25:48.000000000 +0100
+diff -up asc-2.1.0.0/source/sdl/sound.cpp.foo asc-2.1.0.0/source/sdl/sound.cpp
+--- asc-2.1.0.0/source/sdl/sound.cpp.foo 2007-04-13 18:16:09.000000000 +0200
++++ asc-2.1.0.0/source/sdl/sound.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -8,6 +8,7 @@
***************************************************************************/
@@ -86,8 +90,9 @@
#include <boost/regex.hpp>
#include <cstring>
---- asc-2.0.1.0/source/sg.cpp 2007-10-14 14:53:05.000000000 +0200
-+++ asc-2.0.1.0.new/source/sg.cpp 2008-01-12 13:38:40.000000000 +0100
+diff -up asc-2.1.0.0/source/sg.cpp.foo asc-2.1.0.0/source/sg.cpp
+--- asc-2.1.0.0/source/sg.cpp.foo 2008-02-01 23:15:08.000000000 +0100
++++ asc-2.1.0.0/source/sg.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -77,6 +77,7 @@
#include <algorithm>
#include <memory>
@@ -96,8 +101,9 @@
#include <boost/regex.hpp>
#include "paradialog.h"
---- asc-2.0.1.0/source/sgstream.cpp 2007-10-19 20:29:19.000000000 +0200
-+++ asc-2.0.1.0.new/source/sgstream.cpp 2008-01-12 13:38:39.000000000 +0100
+diff -up asc-2.1.0.0/source/sgstream.cpp.foo asc-2.1.0.0/source/sgstream.cpp
+--- asc-2.1.0.0/source/sgstream.cpp.foo 2008-04-05 19:44:41.000000000 +0200
++++ asc-2.1.0.0/source/sgstream.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -36,6 +36,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -106,8 +112,9 @@
#include <boost/regex.hpp>
#include "global.h"
---- asc-2.0.1.0/source/textfile_evaluation.cpp 2007-07-08 21:59:47.000000000 +0200
-+++ asc-2.0.1.0.new/source/textfile_evaluation.cpp 2008-01-12 13:38:40.000000000 +0100
+diff -up asc-2.1.0.0/source/textfile_evaluation.cpp.foo asc-2.1.0.0/source/textfile_evaluation.cpp
+--- asc-2.1.0.0/source/textfile_evaluation.cpp.foo 2007-12-16 18:57:43.000000000 +0100
++++ asc-2.1.0.0/source/textfile_evaluation.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -36,6 +36,7 @@
#include "Windows.h"
#endif
@@ -116,8 +123,9 @@
#include <boost/regex.hpp>
---- asc-2.0.1.0/source/tools/makegfx.cpp 2007-07-08 17:25:21.000000000 +0200
-+++ asc-2.0.1.0.new/source/tools/makegfx.cpp 2008-01-12 13:38:41.000000000 +0100
+diff -up asc-2.1.0.0/source/tools/makegfx.cpp.foo asc-2.1.0.0/source/tools/makegfx.cpp
+--- asc-2.1.0.0/source/tools/makegfx.cpp.foo 2007-07-08 17:25:21.000000000 +0200
++++ asc-2.1.0.0/source/tools/makegfx.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -10,6 +10,7 @@
#include <SDL_image.h>
#include <SDL.h>
@@ -126,8 +134,9 @@
#include <boost/regex.hpp>
#include "../basegfx.h"
---- asc-2.0.1.0/source/widgets/textrenderer-addons.cpp 2007-04-13 18:16:18.000000000 +0200
-+++ asc-2.0.1.0.new/source/widgets/textrenderer-addons.cpp 2008-01-12 13:38:42.000000000 +0100
+diff -up asc-2.1.0.0/source/widgets/textrenderer-addons.cpp.foo asc-2.1.0.0/source/widgets/textrenderer-addons.cpp
+--- asc-2.1.0.0/source/widgets/textrenderer-addons.cpp.foo 2007-04-13 18:16:18.000000000 +0200
++++ asc-2.1.0.0/source/widgets/textrenderer-addons.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -17,6 +17,7 @@
@@ -136,8 +145,9 @@
#include <boost/regex.hpp>
#include <pglabel.h>
#include <pgimage.h>
---- asc-2.0.1.0/source/widgets/textrenderer.cpp 2007-04-13 18:16:18.000000000 +0200
-+++ asc-2.0.1.0.new/source/widgets/textrenderer.cpp 2008-01-12 13:38:41.000000000 +0100
+diff -up asc-2.1.0.0/source/widgets/textrenderer.cpp.foo asc-2.1.0.0/source/widgets/textrenderer.cpp
+--- asc-2.1.0.0/source/widgets/textrenderer.cpp.foo 2008-01-12 18:12:27.000000000 +0100
++++ asc-2.1.0.0/source/widgets/textrenderer.cpp 2008-08-17 10:46:06.000000000 +0200
@@ -17,6 +17,7 @@
Index: asc.spec
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/asc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- asc.spec 14 Apr 2008 19:41:34 -0000 1.11
+++ asc.spec 26 Aug 2008 14:33:23 -0000 1.12
@@ -1,6 +1,6 @@
Name: asc
Version: 2.1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Advanced Strategic Command
Group: Amusements/Games
License: GPLv2+
@@ -80,6 +80,9 @@
%changelog
+* Sun Aug 17 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 2.1.0.0-2
+- Rebuild for new boost
+
* Mon Apr 14 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0.0-1
- New upstream version 2.1.0.0
More information about the fedora-extras-commits
mailing list