[vegastrike] Fix up paths-fix patch for new context.

[Bruno Wolff III]

commit beb8e13bb98349ce9f706b22f326257dc94b210b
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jul 9 09:33:53 2011 -0500

    Fix up paths-fix patch for new context.

 vegastrike-0.4.2-paths-fix.patch |   52 --------------------------------------
 vegastrike-0.5.1-paths-fix.patch |   46 +++++++++++++++++++++++++++++++++
 vegastrike.spec                  |    4 +-
 3 files changed, 48 insertions(+), 54 deletions(-)
---
diff --git a/vegastrike-0.5.1-paths-fix.patch b/vegastrike-0.5.1-paths-fix.patch
new file mode 100644
index 0000000..c3e357c
--- /dev/null
+++ b/vegastrike-0.5.1-paths-fix.patch
@@ -0,0 +1,46 @@
+--- src/cmd/music.cpp.orig	2011-07-09 09:26:05.996489559 -0500
++++ src/cmd/music.cpp	2011-07-09 09:30:12.671840700 -0500
+@@ -123,9 +123,7 @@
+     if ( g_game.music_enabled && !soundServerPipes() ) {
+         int pid = fork();
+         if (!pid) {
+-            string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
+-            pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), NULL );
+-            soundserver_path = VSFileSystem::datadir+"/soundserver";
++            string soundserver_path = "/usr/libexec/vegastrike/soundserver";
+             pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), NULL );
+             g_game.music_enabled = false;
+             VSFileSystem::vs_fprintf( stderr, "Unable to spawn music player server\n" );
+@@ -190,20 +188,9 @@
+             }
+ #else
+             if (g_game.music_enabled) {
+-                std::string tmp = VSFileSystem::datadir+"/bin/soundserver";
+-                FILE *fp = fopen( tmp.c_str(), "rb" );
+-                if (!fp) {
+-                    tmp = VSFileSystem::datadir+"/soundserver";
+-                    fp  = fopen( tmp.c_str(), "rb" );
+-                    if (!fp) {
+-                        g_game.music_enabled = false;
+-                        socketw = -1;
+-                        socketr = -1;
+-                    } else {fclose( fp ); }} else {fclose( fp ); }}
+-            if (g_game.music_enabled) {
+                 int pid = fork();
+                 if (!pid) {
+-                    string soundserver_path = VSFileSystem::datadir+"/bin/soundserver";
++                    string soundserver_path = "/usr/libexec/vegastrike/soundserver";
+                     pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), buffer1, buffer2, NULL );
+                     soundserver_path = VSFileSystem::datadir+"/soundserver";
+                     pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), buffer1, buffer2, NULL );
+--- src/gfx/mesh_xml.cpp.orig	2011-07-09 09:31:44.524514702 -0500
++++ src/gfx/mesh_xml.cpp	2011-07-09 09:32:32.354593661 -0500
+@@ -1132,7 +1132,7 @@
+ #ifndef _WIN32
+     int    pid    = fork();
+     if (!pid) {
+-        string soundserver_path = VSFileSystem::datadir+"/bin/mesher";
++        string soundserver_path = "/usr/libexec/vegastrike/mesher";
+         string firstarg = string( "\"" )+soundserver_path+string( "\"" );
+         pid = execlp( soundserver_path.c_str(), soundserver_path.c_str(), input, output, args, NULL );
+         soundserver_path = VSFileSystem::datadir+"/mesher";
diff --git a/vegastrike.spec b/vegastrike.spec
index eb06e82..63f5cf8 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -12,7 +12,7 @@ Source1:        %{name}-manpages.tar.bz2
 Source2:        %{name}-wrapper.sh
 Source3:        %{name}.desktop
 Patch0:         vegastrike-0.5.1-char-fix.patch
-Patch1:         vegastrike-0.4.2-paths-fix.patch
+Patch1:         vegastrike-0.5.1-paths-fix.patch
 Patch2:         vegastrike-0.4.2-posh-fix.patch
 Patch3:         vegastrike-0.4.2-vssetup-fix.patch
 Patch4:         vegastrike-0.4.3-64-bit.patch
@@ -41,7 +41,7 @@ Yet danger lurks in the space beyond.
 %prep
 %setup -q -a 1 -n %{name}-src-%{version}.beta1
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1