[vegastrike] Fix up sys-python patch for new context.

Bruno Wolff III bruno at fedoraproject.org
Sat Jul 9 19:00:00 UTC 2011


commit 88ea0c27b478ace5337584cd86c46582c8d44851
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jul 9 09:45:48 2011 -0500

    Fix up sys-python patch for new context.

 vegastrike-0.4.3-sys-python.patch |   19 -------------------
 vegastrike-0.5.1-sys-python.patch |   19 +++++++++++++++++++
 vegastrike.spec                   |    4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/vegastrike-0.5.1-sys-python.patch b/vegastrike-0.5.1-sys-python.patch
new file mode 100644
index 0000000..0b1d768
--- /dev/null
+++ b/vegastrike-0.5.1-sys-python.patch
@@ -0,0 +1,19 @@
+--- src/python/init.cpp.orig	2011-07-09 09:42:23.635742453 -0500
++++ src/python/init.cpp	2011-07-09 09:44:12.648597427 -0500
+@@ -285,7 +285,6 @@
+     std::string modpaths( "" );
+     //Find all the mods dir (ignore homedir)
+     for (unsigned int i = 1; i < VSFileSystem::Rootdir.size(); i++) {
+-        modpaths += "r\""+VSFileSystem::Rootdir[i]+PATHSEP+moduledir+PATHSEP "builtin\",";
+         modpaths += "r\""+VSFileSystem::Rootdir[i]+PATHSEP+moduledir+PATHSEP "quests\",";
+         modpaths += "r\""+VSFileSystem::Rootdir[i]+PATHSEP+moduledir+PATHSEP "missions\",";
+         modpaths += "r\""+VSFileSystem::Rootdir[i]+PATHSEP+moduledir+PATHSEP "ai\",";
+@@ -299,7 +298,7 @@
+      *  while ((backslash=modpaths.find("\\"))!=std::string::npos) {
+      *  modpaths[backslash]='/';
+      *  }*/
+-    std::string changepath( "import sys\nprint sys.path\nsys.path = ["+modpaths+"]\n" );
++    std::string changepath( "import sys\nprint sys.path\nsys.path += ["+modpaths+"]\n" );
+     /*
+      *  std::string changepath ("import sys\nprint sys.path\nsys.path = ["
+      *                       "\""+VSFileSystem::datadir+DELIMSTR"modules"DELIMSTR"builtin\""
diff --git a/vegastrike.spec b/vegastrike.spec
index 44543a0..1e09ca0 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -17,7 +17,7 @@ Patch2:         vegastrike-0.4.2-posh-fix.patch
 Patch3:         vegastrike-0.4.2-vssetup-fix.patch
 Patch4:         vegastrike-0.4.3-64-bit.patch
 Patch5:         vegastrike-0.5.1-openal.patch
-Patch6:         vegastrike-0.4.3-sys-python.patch
+Patch6:         vegastrike-0.5.1-sys-python.patch
 Patch7:         vegastrike-0.5.0-boost-make_shared.patch
 Patch8:         vegastrike-0.5.0-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
@@ -46,7 +46,7 @@ Yet danger lurks in the space beyond.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
-%patch6 -p1
+%patch6 -p0
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1


More information about the scm-commits mailing list