rpms/xmoto/F-10 xmoto-0.4.2-initode.patch, 1.2, 1.3 xmoto.spec, 1.45, 1.46

[Jon Ciesla]

Author: limb

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

Modified Files:
	xmoto-0.4.2-initode.patch xmoto.spec 
Log Message:
Patch fix.


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmoto-0.4.2-initode.patch	15 Oct 2008 14:44:47 -0000	1.2
+++ xmoto-0.4.2-initode.patch	30 Jan 2009 18:06:40 -0000	1.3
@@ -1,11 +1,11 @@
-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 */
+--- 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 */
 +  dInitODE();
-   m_WorldID = dWorldCreate();
-   dWorldSetERP(m_WorldID,PHYS_WORLD_ERP);
-   dWorldSetCFM(m_WorldID,PHYS_WORLD_CFM);
+   /* Start application */
+   try {     
+     /* Setup basic info */


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xmoto.spec	30 Jan 2009 18:00:27 -0000	1.45
+++ xmoto.spec	30 Jan 2009 18:06:40 -0000	1.46
@@ -44,11 +44,11 @@
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -F2 -p0
+%patch2 -p0 -F2
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -F2 -p0
+%patch6 -p0 -F2
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp