rpms/asc/devel .cvsignore, 1.4, 1.5 asc-2.0.1.0-gcc43.patch, 1.3, 1.4 asc.spec, 1.13, 1.14 sources, 1.4, 1.5

Hans de Goede jwrdegoede at fedoraproject.org
Mon Dec 15 12:25:35 UTC 2008 

Author: jwrdegoede

Update of /cvs/extras/rpms/asc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909

Modified Files:
	.cvsignore asc-2.0.1.0-gcc43.patch asc.spec sources 
Log Message:
* Mon Dec 15 2008 Hans de Goede <hdegoede at redhat.com> 2.2.0.0-1
- New upstream version 2.2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Apr 2008 19:41:34 -0000	1.4
+++ .cvsignore	15 Dec 2008 12:25:04 -0000	1.5
@@ -1 +1 @@
-asc-2.1.0.0.tar.bz2
+asc-2.2.0.0.tar.bz2

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- asc-2.0.1.0-gcc43.patch	26 Aug 2008 14:33:23 -0000	1.3
+++ asc-2.0.1.0-gcc43.patch	15 Dec 2008 12:25:04 -0000	1.4
@@ -1,6 +1,6 @@
-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
+diff -up asc-2.2.0.0/source/ASCStringHelpers.h.foo asc-2.2.0.0/source/ASCStringHelpers.h
+--- asc-2.2.0.0/source/ASCStringHelpers.h.foo	2007-12-08 14:19:02.000000000 +0100
++++ asc-2.2.0.0/source/ASCStringHelpers.h	2008-12-15 12:15:52.000000000 +0100
 @@ -8,6 +8,7 @@
  #include <cstring>
  #include <memory>
@@ -57,9 +57,9 @@
      #endif
  
  #endif // _UNIX_
-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
+diff -up asc-2.2.0.0/source/dialogs/exchangegraphics.cpp.foo asc-2.2.0.0/source/dialogs/exchangegraphics.cpp
+--- asc-2.2.0.0/source/dialogs/exchangegraphics.cpp.foo	2007-04-12 22:53:24.000000000 +0200
++++ asc-2.2.0.0/source/dialogs/exchangegraphics.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -15,6 +15,7 @@
   *                                                                         *
   ***************************************************************************/
@@ -68,9 +68,9 @@
  #include <boost/regex.hpp>
  
  #include "../paradialog.h"
-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
+diff -up asc-2.2.0.0/source/fieldimageloader.cpp.foo asc-2.2.0.0/source/fieldimageloader.cpp
+--- asc-2.2.0.0/source/fieldimageloader.cpp.foo	2008-07-11 19:42:20.000000000 +0200
++++ asc-2.2.0.0/source/fieldimageloader.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -19,6 +19,7 @@
  #include <algorithm>
  #include <iostream>
@@ -79,9 +79,9 @@
  #include <boost/regex.hpp>
  
  #include "global.h"
-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
+diff -up asc-2.2.0.0/source/sdl/sound.cpp.foo asc-2.2.0.0/source/sdl/sound.cpp
+--- asc-2.2.0.0/source/sdl/sound.cpp.foo	2008-06-27 21:22:12.000000000 +0200
++++ asc-2.2.0.0/source/sdl/sound.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -8,6 +8,7 @@
   ***************************************************************************/
  
@@ -90,20 +90,20 @@
  #include <boost/regex.hpp>
  
  #include <cstring>
-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>
+diff -up asc-2.2.0.0/source/sg.cpp.foo asc-2.2.0.0/source/sg.cpp
+--- asc-2.2.0.0/source/sg.cpp.foo	2008-11-30 12:04:32.000000000 +0100
++++ asc-2.2.0.0/source/sg.cpp	2008-12-15 12:16:50.000000000 +0100
+@@ -78,6 +78,7 @@
  #include <memory>
+ #include <fstream>
  
 +#include <limits.h> /* needed by boost/regex.hpp when compiling with gcc4.3 */
  #include <boost/regex.hpp>
  
  #include "paradialog.h"
-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
+diff -up asc-2.2.0.0/source/sgstream.cpp.foo asc-2.2.0.0/source/sgstream.cpp
+--- asc-2.2.0.0/source/sgstream.cpp.foo	2008-11-23 19:16:48.000000000 +0100
++++ asc-2.2.0.0/source/sgstream.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -36,6 +36,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -112,9 +112,9 @@
  #include <boost/regex.hpp>
  
  #include "global.h"
-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
+diff -up asc-2.2.0.0/source/textfile_evaluation.cpp.foo asc-2.2.0.0/source/textfile_evaluation.cpp
+--- asc-2.2.0.0/source/textfile_evaluation.cpp.foo	2007-12-16 18:57:43.000000000 +0100
++++ asc-2.2.0.0/source/textfile_evaluation.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -36,6 +36,7 @@
  #include "Windows.h"
  #endif
@@ -123,9 +123,9 @@
  #include <boost/regex.hpp>
  
  
-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
+diff -up asc-2.2.0.0/source/tools/makegfx.cpp.foo asc-2.2.0.0/source/tools/makegfx.cpp
+--- asc-2.2.0.0/source/tools/makegfx.cpp.foo	2007-07-08 17:25:21.000000000 +0200
++++ asc-2.2.0.0/source/tools/makegfx.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -10,6 +10,7 @@
  #include <SDL_image.h>
  #include <SDL.h>
@@ -134,9 +134,9 @@
  #include <boost/regex.hpp>
  
  #include "../basegfx.h"
-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
+diff -up asc-2.2.0.0/source/widgets/textrenderer-addons.cpp.foo asc-2.2.0.0/source/widgets/textrenderer-addons.cpp
+--- asc-2.2.0.0/source/widgets/textrenderer-addons.cpp.foo	2007-04-13 18:16:18.000000000 +0200
++++ asc-2.2.0.0/source/widgets/textrenderer-addons.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -17,6 +17,7 @@
  
  
@@ -145,9 +145,9 @@
  #include <boost/regex.hpp>
  #include <pglabel.h>
  #include <pgimage.h>
-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
+diff -up asc-2.2.0.0/source/widgets/textrenderer.cpp.foo asc-2.2.0.0/source/widgets/textrenderer.cpp
+--- asc-2.2.0.0/source/widgets/textrenderer.cpp.foo	2008-11-23 19:16:48.000000000 +0100
++++ asc-2.2.0.0/source/widgets/textrenderer.cpp	2008-12-15 12:15:52.000000000 +0100
 @@ -17,6 +17,7 @@
  
  


Index: asc.spec
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/asc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- asc.spec	26 Aug 2008 15:30:22 -0000	1.13
+++ asc.spec	15 Dec 2008 12:25:04 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           asc
-Version:        2.1.0.0
-Release:        2%{?dist}
+Version:        2.2.0.0
+Release:        1%{?dist}
 Summary:        Advanced Strategic Command
 Group:          Amusements/Games
 License:        GPLv2+
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -z .foo
 sed -i 's|$datadir/games/|$datadir/|g' configure
 sed -i 's|$(datadir)/games/|$(datadir)/|g' `find -name Makefile.in`
 chmod -x source/libs/paragui/include/paragui.h
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Mon Dec 15 2008 Hans de Goede <hdegoede at redhat.com> 2.2.0.0-1
+- New upstream version 2.2.0.0
+
 * Sun Aug 17 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 2.1.0.0-2
 - Rebuild for new boost
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Apr 2008 19:41:34 -0000	1.4
+++ sources	15 Dec 2008 12:25:04 -0000	1.5
@@ -1 +1 @@
-d76cf500bebdddd8e7d2a094b532e6af  asc-2.1.0.0.tar.bz2
+a5207e63109bb81b432542d0b43e9970  asc-2.2.0.0.tar.bz2

More information about the fedora-extras-commits mailing list