rpms/xmoto/devel xmoto-0.4.2-initode.patch, 1.1, 1.2 xmoto.spec, 1.42, 1.43

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12336

Modified Files:
	xmoto-0.4.2-initode.patch xmoto.spec 
Log Message:
* Wed Oct 15 2008 Hans de Goede <hdegoede at redhat.com> 0.4.2-4
- Fix crash caused by using new ode (bz 466738)


xmoto-0.4.2-initode.patch:

Index: xmoto-0.4.2-initode.patch
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto-0.4.2-initode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmoto-0.4.2-initode.patch	30 Sep 2008 13:49:18 -0000	1.1
+++ xmoto-0.4.2-initode.patch	15 Oct 2008 14:44:47 -0000	1.2
@@ -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);


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xmoto.spec	30 Sep 2008 13:49:18 -0000	1.42
+++ xmoto.spec	15 Oct 2008 14:44:47 -0000	1.43
@@ -1,7 +1,7 @@
 %define _default_patch_fuzz 2
 Name:		xmoto
 Version:	0.4.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -47,7 +47,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
-%patch5 -p0
+%patch5 -p1
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -100,6 +100,9 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Wed Oct 15 2008 Hans de Goede <hdegoede at redhat.com> 0.4.2-4
+- Fix crash caused by using new ode (bz 466738)
+
 * Tue Sep 30 2008 Jon Ciesla <limb at jcomserv.net> 0.4.2-3
 - Patch for new ode version.