rpms/stratagus/devel import.log, NONE, 1.1 stratagus--guichan_external.diff, NONE, 1.1 stratagus.spec, 1.22, 1.23
Peter Lemenkov
peter at fedoraproject.org
Thu Nov 20 09:57:47 UTC 2008
- Previous message (by thread): rpms/vpnc/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vpnc-cleanup, 1.1, 1.2 vpnc.spec, 1.31, 1.32 vpnc-0.5.1-domain.patch, 1.1, NONE vpnc-0.5.1-mtu.patch, 1.2, NONE
- Next message (by thread): rpms/stratagus/F-10 import.log, NONE, 1.1 stratagus--guichan_external.diff, NONE, 1.1 stratagus.spec, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/extras/rpms/stratagus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9808/devel
Modified Files:
stratagus.spec
Added Files:
import.log stratagus--guichan_external.diff
Log Message:
Fixed urls
--- NEW FILE import.log ---
stratagus-2_2_4-5_fc9:HEAD:stratagus-2.2.4-5.fc9.src.rpm:1227174807
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
Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stratagus.spec 26 Feb 2008 10:47:46 -0000 1.22
+++ stratagus.spec 20 Nov 2008 09:57:17 -0000 1.23
@@ -1,13 +1,15 @@
-Name: stratagus
-Summary: Real-time strategy gaming engine
-Version: 2.2.4
-Release: 4%{?dist}
-License: GPLv2
-Group: Development/Libraries
-URL: http://www.stratagus.org/
-Source0: http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz
+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://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
Patch0: stratagus--use_external_tolua.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
@@ -33,9 +36,18 @@
%setup -q
%patch0
%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 \
@@ -45,8 +57,7 @@
%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}
@@ -54,9 +65,13 @@
%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)
- Previous message (by thread): rpms/vpnc/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vpnc-cleanup, 1.1, 1.2 vpnc.spec, 1.31, 1.32 vpnc-0.5.1-domain.patch, 1.1, NONE vpnc-0.5.1-mtu.patch, 1.2, NONE
- Next message (by thread): rpms/stratagus/F-10 import.log, NONE, 1.1 stratagus--guichan_external.diff, NONE, 1.1 stratagus.spec, 1.22, 1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list