rpms/stratagus/F-8 import.log, NONE, 1.1 stratagus--guichan_external.diff, NONE, 1.1 stratagus-gcc43.patch, NONE, 1.1 stratagus.spec, 1.20, 1.21

[Peter Lemenkov]

Author: peter

Update of /cvs/extras/rpms/stratagus/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11050/F-8

Modified Files:
	stratagus.spec 
Added Files:
	import.log stratagus--guichan_external.diff 
	stratagus-gcc43.patch 
Log Message:
Fixed urls


--- NEW FILE import.log ---
stratagus-2_2_4-5_fc9:F-8:stratagus-2.2.4-5.fc9.src.rpm:1227175489

stratagus--guichan_external.diff:

--- NEW FILE stratagus--guichan_external.diff ---
Index: src/include/widgets.h
===================================================================
--- src/include/widgets.h	(revision 7912)
+++ src/include/widgets.h	(working copy)
@@ -31,8 +31,8 @@
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
 
-#include <guichan.h>
-#include <guichan/gsdl.h>
+#include <guichan.hpp>
+#include <guichan/sdl.hpp>
 
 typedef int lua_Object; // from tolua++.h
 
Index: src/include/video.h
===================================================================
--- src/include/video.h	(revision 7912)
+++ src/include/video.h	(working copy)
@@ -40,7 +40,7 @@
 class CFont;
 #endif
 
-#include "guichan.h"
+#include <guichan.hpp>
 
 class CGraphic : public gcn::Image {
 protected:
Index: src/editor/editloop.cpp
===================================================================
--- src/editor/editloop.cpp	(revision 7912)
+++ src/editor/editloop.cpp	(working copy)
@@ -57,7 +57,7 @@
 #include "iolib.h"
 #include "iocompat.h"
 #include "commands.h"
-#include "guichan.h"
+#include <guichan.hpp>
 
 #include "script.h"
 
Index: Rules.make.in
===================================================================
--- Rules.make.in	(revision 7912)
+++ Rules.make.in	(working copy)
@@ -17,9 +17,9 @@
 # Prefix for 'make install'
 PREFIX=@PREFIX@
 
-CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include
+CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include
 CXXFLAGS=@CXXFLAGS@
-LDFLAGS=@LDFLAGS@ -lpng -lz -lm
+LDFLAGS=@LDFLAGS@ -lpng -lz -lm -ltolua++ -lguichan
 
 OBJDIR=@OBJDIR@
 
Index: Makefile
===================================================================
--- Makefile	(revision 7912)
+++ Makefile	(working copy)
@@ -38,7 +38,7 @@
 INCLUDE_DIRS = src/include
 
 MODULES = src/action src/ai src/beos src/editor src/game \
-          src/guichan src/map src/network src/pathfinder \
+          src/map src/network src/pathfinder \
           src/sound src/stratagus src/tolua src/ui src/unit \
           src/video
 

stratagus-gcc43.patch:

--- NEW FILE stratagus-gcc43.patch ---
diff -up stratagus-2.2.4/src/video/movie.cpp.gcc43 stratagus-2.2.4/src/video/movie.cpp
--- stratagus-2.2.4/src/video/movie.cpp.gcc43	2006-11-22 17:32:21.000000000 +0100
+++ stratagus-2.2.4/src/video/movie.cpp	2008-02-26 11:43:55.000000000 +0100
@@ -299,6 +299,7 @@ int PlayMovie(const std::string &name)
 #else
 
 #include <string>
+#include <cstring>
 
 /**
 **  FIXME: docu


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/F-8/stratagus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stratagus.spec	21 Feb 2008 10:16:05 -0000	1.20
+++ stratagus.spec	20 Nov 2008 10:05:59 -0000	1.21
@@ -1,13 +1,15 @@
-Name: 		stratagus
-Summary: 	Real-time strategy gaming engine
-Version: 	2.2.4
-Release: 	2%{?dist}
-License: 	GPL
-Group: 		Development/Libraries
+Name:		stratagus
+Summary:	Real-time strategy gaming engine
+Version:	2.2.4
+Release:	5%{?dist}
+License:	GPLv2
+Group:		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
-Source0: 	http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
 Patch0:		stratagus--use_external_tolua.diff
-#Patch1:		stratagus--use-lua51.diff
+Patch1:		stratagus-gcc43.patch
+# currently broken
+Patch2:		stratagus--guichan_external.diff
 BuildRequires:	mikmod-devel
 BuildRequires:	tolua++-devel
 BuildRequires:  lua-devel
@@ -18,8 +20,9 @@
 BuildRequires:	SDL-devel
 BuildRequires:  libGL-devel
 BuildRequires:  libGLU-devel
+BuildRequires:	dos2unix
 
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Stratagus is a free cross-platform real-time strategy gaming engine. It
@@ -30,24 +33,31 @@
 of current games using the stratagus engine.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
-#%patch1
-#sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
+%patch1 -p1 -b .gcc43
+#%patch2 -p0 -b .guichan
+dos2unix doc/graphics/stratagus.gimp
+dos2unix doc/scripts/makeindex.py
+dos2unix doc/scripts/showindex.py
+dos2unix doc/scripts/findlua.py
+dos2unix doc/metaserver_protocol.txt
+dos2unix doc/README-SDL.txt
+dos2unix README
+iconv -f iso8859-1 -t utf8 doc/guichan-copyright.txt > doc/guichan-copyright.utf8 && mv -f doc/guichan-copyright.{utf8,txt}
 
 %build
-%configure  	--with-x \
+%configure	--with-x \
 		--with-bz2 \
 		--with-ogg \
 		--with-mikmod \
-		--with-opengl 
+		--with-opengl
 
 %{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 stratagus $RPM_BUILD_ROOT%{_bindir}
+install -D -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -55,13 +65,23 @@
 %files
 %defattr(-,root,root,-)
 %doc README doc/
-%{_bindir}/stratagus
+%{_bindir}/%{name}
 
 %changelog
+* Thu Nov 20 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2.4-5
+- Fixed links
+- Cosmetic cleanups
+
+* Tue Feb 26 2008 Jindrich Novy <jnovy at redhat.com> 2.2.4-4
+- fix build in gcc-4.3 (#434370)
+- rebuild against new libmikmod (#434783)
 
-* Thu Feb 21 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2.4-2
+* Sat Feb 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2.4-3
 - rebuild
 
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.4-2
+- Autorebuild for GCC 4.3
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.2.4-1
 - Version 2.2.4