rpms/asc/devel .cvsignore, 1.3, 1.4 asc-2.0.1.0-gcc43.patch, 1.1, 1.2 asc.spec, 1.10, 1.11 sources, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore asc-2.0.1.0-gcc43.patch asc.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Oct 2007 20:03:24 -0000	1.3
+++ .cvsignore	14 Apr 2008 19:41:34 -0000	1.4
@@ -1 +1 @@
-asc-2.0.1.0.tar.bz2
+asc-2.1.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asc-2.0.1.0-gcc43.patch	12 Jan 2008 13:11:13 -0000	1.1
+++ asc-2.0.1.0-gcc43.patch	14 Apr 2008 19:41:34 -0000	1.2
@@ -76,35 +76,6 @@
  #include <boost/regex.hpp>
  
  #include "global.h"
---- asc-2.0.1.0/source/libs/loki/Reference/SmallObj.cpp	2007-04-12 22:54:00.000000000 +0200
-+++ asc-2.0.1.0.new/source/libs/loki/Reference/SmallObj.cpp	2008-01-12 12:22:17.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <cassert>
- #include <algorithm>
- #include <functional>
-+#include <limits.h>
- 
- using namespace Loki;
- 
---- asc-2.0.1.0/source/libs/paragui/src/core/pgfilearchive.cpp	2007-04-13 18:16:00.000000000 +0200
-+++ asc-2.0.1.0.new/source/libs/paragui/src/core/pgfilearchive.cpp	2008-01-12 12:12:41.000000000 +0100
-@@ -35,6 +35,7 @@
- ///#include "SDL_loadso.h"
- #include "physfsrwops.h"
- #include <iostream>
-+#include <string.h>
- #include "paragui.h"
- 
- Uint32 PG_FileArchive::my_instance_count = 0;
-@@ -109,7 +110,7 @@
- 	const char* sep = GetDirSeparator();
- 	std::string::size_type pos = 0, incr;
- 	newpath = new std::string(path);
--	incr = std::strlen(sep);
-+	incr = strlen(sep);
- 	if(incr == 1 && sep[0] == '/')
- 		return newpath;
- 
 --- 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
 @@ -8,6 +8,7 @@


Index: asc.spec
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/asc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- asc.spec	19 Feb 2008 07:58:52 -0000	1.10
+++ asc.spec	14 Apr 2008 19:41:34 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           asc
-Version:        2.0.1.0
-Release:        3%{?dist}
+Version:        2.1.0.0
+Release:        1%{?dist}
 Summary:        Advanced Strategic Command
 Group:          Amusements/Games
 License:        GPLv2+
@@ -14,9 +14,6 @@
 BuildRequires:  libvorbis-devel libpng-devel libtiff-devel boost-devel
 BuildRequires:  freetype-devel expat-devel desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme
-# SDL_mixer < 1.2.8-5 has its own private copy of libmikmod causing problems
-# with SDL_sound, see bug 355991
-Requires:       SDL_mixer >= 1.2.8-5
 
 %description
 ASC is a free, turn based strategy game.
@@ -27,6 +24,7 @@
 %patch0 -p1
 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
 
 
 %build
@@ -82,6 +80,9 @@
 
 
 %changelog
+* 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
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.1.0-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Oct 2007 20:03:24 -0000	1.3
+++ sources	14 Apr 2008 19:41:34 -0000	1.4
@@ -1 +1 @@
-2758e2bbbd5892ccba8d9b4ac5a6d6af  asc-2.0.1.0.tar.bz2
+d76cf500bebdddd8e7d2a094b532e6af  asc-2.1.0.0.tar.bz2