rpms/openlierox/devel openlierox-0.57beta4-findfile-crash.patch, NONE, 1.1 openlierox-linux.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 openlierox.desktop, 1.2, 1.3 openlierox.spec, 1.7, 1.8 sources, 1.4, 1.5 openlierox-0.57-64bit.patch, 1.3, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore openlierox.desktop openlierox.spec sources 
Added Files:
	openlierox-0.57beta4-findfile-crash.patch 
	openlierox-linux.patch 
Removed Files:
	openlierox-0.57-64bit.patch 
Log Message:
* Mon Feb 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.57-0.8.beta4
- New upstream release 0.57beta4


openlierox-0.57beta4-findfile-crash.patch:

--- NEW FILE openlierox-0.57beta4-findfile-crash.patch ---
--- OpenLieroX/src/common/FindFile.cpp~	2008-02-26 13:51:27.000000000 +0100
+++ OpenLieroX/src/common/FindFile.cpp	2008-02-26 13:51:27.000000000 +0100
@@ -739,7 +739,7 @@ std::string GetAbsolutePath(const std::s
 	else  // Failed
 		return path;
 #else
-	static char buf[1024];
+	static char buf[PATH_MAX];
 	if(realpath(path.c_str(), buf) != NULL) {
 		fix_markend(buf);
 		return buf;

openlierox-linux.patch:

--- NEW FILE openlierox-linux.patch ---
diff -up OpenLieroX/src/common/stun.cpp~ OpenLieroX/src/common/stun.cpp
--- OpenLieroX/src/common/stun.cpp~	2008-02-25 14:52:52.000000000 +0100
+++ OpenLieroX/src/common/stun.cpp	2008-02-25 14:52:52.000000000 +0100
@@ -728,7 +728,7 @@ stunRand()
       asm("rdtsc" : "=A" (tick));
 #elif defined (__SUNPRO_CC) || defined( __sparc__ )	
       tick = gethrtime();
-#elif defined(__MACH__) 
+#elif defined(__MACH__) || defined(__linux__)
       int fd=open("/dev/random",O_RDONLY);
       read(fd,&tick,sizeof(tick));
       close(fd);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Aug 2007 14:18:36 -0000	1.4
+++ .cvsignore	26 Feb 2008 13:37:02 -0000	1.5
@@ -1 +1 @@
-OpenLieroX_0.57_beta3.src.tar.bz2
+OpenLieroX_0.57_beta4.src.tar.bz2


Index: openlierox.desktop
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/openlierox.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openlierox.desktop	13 Aug 2007 14:18:36 -0000	1.2
+++ openlierox.desktop	26 Feb 2008 13:37:02 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=OpenLieroX
 Comment=Addictive realtime multiplayer 2D shoot-em-up
 Exec=openlierox
-Icon=openlierox.png
+Icon=openlierox
 Terminal=false
 StartupNotify=false
 Type=Application


Index: openlierox.spec
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/openlierox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openlierox.spec	19 Feb 2008 09:23:07 -0000	1.7
+++ openlierox.spec	26 Feb 2008 13:37:02 -0000	1.8
@@ -1,8 +1,8 @@
-%define prever beta3
+%define prever beta4
 
 Name:           openlierox
 Version:        0.57
-Release:        0.7.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 Summary:        Addictive realtime multiplayer 2D shoot-em-up
 Group:          Amusements/Games
 License:        LGPLv2+
@@ -10,7 +10,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/OpenLieroX_%{version}_%{prever}.src.tar.bz2
 Source1:        %{name}.desktop
 Source2:        README.fedora
-Patch0:         openlierox-0.57-64bit.patch
+Patch0:         openlierox-linux.patch
+Patch1:         openlierox-0.57beta4-findfile-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel SDL_gfx-devel gd-devel
 BuildRequires:  libxml2-devel hawknl-devel zlib-devel desktop-file-utils
@@ -26,7 +27,8 @@
 
 %prep
 %setup -q -n OpenLieroX
-%patch0 -p1 -z .64bit
+%patch0 -p1
+%patch1 -p1
 sed -i 's|test_include_file nl.h|test_include_file hawknl/nl.h|g' compile.sh
 sed -i 's/\r//g' doc/original_lx_docs/*.*
 cp -a %{SOURCE2} .
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Mon Feb 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.57-0.8.beta4
+- New upstream release 0.57beta4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.57-0.7.beta3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openlierox/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Aug 2007 14:18:36 -0000	1.4
+++ sources	26 Feb 2008 13:37:02 -0000	1.5
@@ -1 +1 @@
-4438b58b1f7c87af739efe0daa9147fc  OpenLieroX_0.57_beta3.src.tar.bz2
+e215536b51881703cfe2a8f76a72c16e  OpenLieroX_0.57_beta4.src.tar.bz2


--- openlierox-0.57-64bit.patch DELETED ---