rpms/xmoto/F-10 xmoto-0.5.0-helpers-log-include.patch, NONE, 1.1 xmoto-0.5.0-helpers-text-includes.patch, NONE, 1.1 xmoto-0.5.0-xmargs-include.patch, NONE, 1.1 sources, 1.14, 1.15 xmoto-0.4.2-initode.patch, 1.3, 1.4 xmoto-0.4.2-opengldepth.patch, 1.1, 1.2 xmoto.spec, 1.48, 1.49

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1331

Modified Files:
	sources xmoto-0.4.2-initode.patch 
	xmoto-0.4.2-opengldepth.patch xmoto.spec 
Added Files:
	xmoto-0.5.0-helpers-log-include.patch 
	xmoto-0.5.0-helpers-text-includes.patch 
	xmoto-0.5.0-xmargs-include.patch 
Log Message:
Update to 0.5.1, BZ 509674


xmoto-0.5.0-helpers-log-include.patch:

--- NEW FILE xmoto-0.5.0-helpers-log-include.patch ---
--- src/helpers/Log.cpp.orig	2009-02-23 12:42:15.000000000 -0600
+++ src/helpers/Log.cpp	2009-02-23 12:42:15.000000000 -0600
@@ -25,0 +26 @@
+#include <cstdio>

xmoto-0.5.0-helpers-text-includes.patch:

--- NEW FILE xmoto-0.5.0-helpers-text-includes.patch ---
--- src/helpers/Text.cpp.orig	2009-02-23 12:32:09.000000000 -0600
+++ src/helpers/Text.cpp	2009-02-23 12:32:10.000000000 -0600
@@ -21,0 +22 @@
+#include <cstdio>

xmoto-0.5.0-xmargs-include.patch:

--- NEW FILE xmoto-0.5.0-xmargs-include.patch ---
--- src/XMArgs.cpp.orig	2009-02-23 12:17:49.000000000 -0600
+++ src/XMArgs.cpp	2009-02-23 12:17:49.000000000 -0600
@@ -26,0 +27 @@
+#include <cstdio>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Mar 2008 00:00:01 -0000	1.14
+++ sources	6 Jul 2009 12:31:07 -0000	1.15
@@ -1 +1 @@
-15368b282641a225b71c279fe4dc0dc4  xmoto-0.4.2-src.tar.gz
+10cb822ec8c2c7e9466806633e69be1f  xmoto-0.5.1-src.tar.gz

xmoto-0.4.2-initode.patch:

Index: xmoto-0.4.2-initode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto-0.4.2-initode.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmoto-0.4.2-initode.patch	30 Jan 2009 18:06:40 -0000	1.3
+++ xmoto-0.4.2-initode.patch	6 Jul 2009 12:31:07 -0000	1.4
@@ -1,11 +1,11 @@
---- src/GameInit.cpp	2008-09-30 07:37:22.000000000 -0500
-+++ src/GameInit.cpp	2008-09-30 07:37:22.000000000 -0500
-@@ -57,6 +57,8 @@
- #else
- int main(int nNumArgs, char **ppcArgs) {
- #endif
-+  /* Init ODE -jciesla, 9/30/08, Fedora */
+diff -up xmoto-0.4.2/src/xmscene/BikePlayer.cpp~ xmoto-0.4.2/src/xmscene/BikePlayer.cpp
+--- xmoto-0.4.2/src/xmscene/BikePlayer.cpp~	2008-10-15 14:13:13.000000000 +0200
++++ xmoto-0.4.2/src/xmscene/BikePlayer.cpp	2008-10-15 14:35:10.000000000 +0200
+@@ -146,6 +146,7 @@ void PlayerBiker::initPhysics(Vector2f i
+   m_bFirstPhysicsUpdate = true;
+ 
+   /* Setup ODE */
 +  dInitODE();
-   /* Start application */
-   try {     
-     /* Setup basic info */
+   m_WorldID = dWorldCreate();
+   dWorldSetERP(m_WorldID,PHYS_WORLD_ERP);
+   dWorldSetCFM(m_WorldID,PHYS_WORLD_CFM);

xmoto-0.4.2-opengldepth.patch:

Index: xmoto-0.4.2-opengldepth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto-0.4.2-opengldepth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmoto-0.4.2-opengldepth.patch	30 Jan 2009 16:57:06 -0000	1.1
+++ xmoto-0.4.2-opengldepth.patch	6 Jul 2009 12:31:07 -0000	1.2
@@ -1,22 +1,13 @@
---- src/drawlib/DrawLibOpenGL.cpp	2008-03-18 19:33:33.000000000 +0200
-+++ src/drawlib/DrawLibOpenGL.cpp~	2009-01-25 17:06:46.000000000 +0200
-@@ -267,19 +267,10 @@
-                     
-   m_nDispBPP=pVidInfo->vfmt->BitsPerPixel;
- 
+--- src/drawlib/DrawLibOpenGL.cpp~	2009-02-02 09:37:16.000000000 -0600
++++ src/drawlib/DrawLibOpenGL.cpp	2009-02-02 09:37:16.000000000 -0600
+@@ -275,6 +274,0 @@
 -  /* Did we get a z-buffer? */        
 -  int nDepthBits;
--  SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE,&nDepthBits);
+-  SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &nDepthBits);
 -  if(nDepthBits == 0)
 -    throw Exception("no depth buffer");  
 -  
-   m_menuCamera = new Camera(Vector2i(0,0),
- 			    Vector2i(m_nDispWidth,m_nDispHeight));
-   m_menuCamera->setCamera2d();
-     
+@@ -285,3 +278,0 @@
 -  glClearDepth(1);
 -  glDepthFunc(GL_LEQUAL);
--     
-   /* Output some general info */
-   Logger:: Log("GL: %s (%s)",glGetString(GL_RENDERER),glGetString(GL_VENDOR));
-   if(glGetString(GL_RENDERER) == NULL || 
+-


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xmoto.spec	17 Feb 2009 20:57:37 -0000	1.48
+++ xmoto.spec	6 Jul 2009 12:31:07 -0000	1.49
@@ -1,7 +1,6 @@
-%define _default_patch_fuzz 2
 Name:		xmoto
-Version:	0.4.2
-Release:	6%{?dist}
+Version:	0.5.1
+Release:	0%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -12,12 +11,14 @@ Source1:	xmoto.desktop
 Source2:	xmoto.png
 #Patch0:		xmoto-man.patch
 Patch1:		xmoto-0.3.4-Environment-cstlib.patch
-Patch2:		xmoto-0.3.4-Scene-collisioninclude.patch
+#Patch2:		xmoto-0.3.4-Scene-collisioninclude.patch
 Patch3:		xmoto-0.4.0-Environment-string.patch
-Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
-Patch5:		xmoto-0.4.2-initode.patch
-Patch6:		xmoto-0.4.2-opengldepth.patch
-Patch7:		xmoto-0.4.2-closeode.patch
+#Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
+#Patch5:		xmoto-0.4.2-initode.patch
+#Patch6:		xmoto-0.4.2-opengldepth.patch
+Patch7:		xmoto-0.5.0-xmargs-include.patch
+Patch8:		xmoto-0.5.0-helpers-text-includes.patch
+Patch9:		xmoto-0.5.0-helpers-log-include.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -32,6 +33,13 @@ BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	sqlite-devel
+BuildRequires:	SDL_net-devel
+%if "0%{?dist}" == "0.fc10"
+Requires: dejavu-fonts
+%else
+Requires: dejavu-sans-fonts
+%endif
+
 
 %description
 X-Moto is a challenging 2D motocross platform game, where physics play an all
@@ -46,12 +54,14 @@ yourself and others, racing against the 
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -p0
+#%patch2 -p0
 %patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+#%patch4 -p0
+#%patch5 -p1
+#%patch6 -p0
 %patch7 -p0
+%patch8 -p0
+%patch9 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -59,6 +69,12 @@ sed -i 's/\r//' src/xmscene/Camera.h
 
 #fix permissions
 chmod 644 src/xmscene/Camera.*
+chmod -x src/*.cpp
+chmod -x src/*.h
+chmod -x src/*/*.cpp
+chmod -x src/*/*.h
+chmod -x src/*/*/*.cpp
+chmod -x src/*/*/*.h
 
 %build
 %configure --with-enable-zoom=1
@@ -75,6 +91,9 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}
 
 desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --add-category X-Fedora %{SOURCE1}
 
+rm $RPM_BUILD_ROOT%{_datadir}/xmoto/Textures/Fonts/DejaVuSans.ttf 
+ln -s ../../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/xmoto/Textures/Fonts/DejaVuSans.ttf 
+
 # Locale files
 %find_lang %{name} %{name}.lang
 
@@ -104,12 +123,28 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
-* Tue Feb 17 2009 Jon Ciesla <limb at jcomserv.net> 0.4.2-6
-- Fix for ode call crash, BZ 484493.
+* Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 0.5.1-0
+- New upstream.
+- Dropped opengldepth patch, applied upstream.
 
-* Mon Jan 26 2009 Jon Ciesla <limb at jcomserv.net> 0.4.2-5
+* Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-6
+- Patch for includes.
+
+* Mon Feb 02 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-5
 - Fix for ati crash, BZ 481485.
-- De-fuzz patches.
+
+* Tue Jan 20 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-4
+- Font requires change for BZ 480480, dejavu rename.
+
+* Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> 0.5.0-3
+- Symlink to system font, BZ 477485.
+- Dropped extension from icon in .desktop.
+
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net> 0.5.0-2
+- No remaining fuzzy patches, dropping patch fuzz workaround.
+
+* Mon Dec 01 2008 Jon Ciesla <limb at jcomserv.net> 0.5.0-1
+- Update to 0.5.0.
 
 * Wed Oct 15 2008 Hans de Goede <hdegoede at redhat.com> 0.4.2-4
 - Fix crash caused by using new ode (bz 466738)