[egoboo] Point the paths to where stuff will be installed

Bruno Wolff III bruno at fedoraproject.org
Tue Mar 13 02:51:21 UTC 2012


commit 28db32336275528ca63d0ea34e72139f9ca01f52
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Mar 11 14:57:51 2012 -0500

    Point the paths to where stuff will be installed
    
    Some of the path info that was hard coded is not right for Fedora.
    So make file options won't work and the code needs to be changed.

 egoboo-paths.patch |   15 +++++++++++++++
 egoboo.spec        |    2 ++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/egoboo-paths.patch b/egoboo-paths.patch
new file mode 100644
index 0000000..92ee2ab
--- /dev/null
+++ b/egoboo-paths.patch
@@ -0,0 +1,15 @@
+--- src/game/platform/file_linux.c.orig	2012-03-11 14:54:05.615088067 -0500
++++ src/game/platform/file_linux.c	2012-03-11 14:56:26.945050377 -0500
+@@ -74,9 +74,9 @@
+     // so that the program will compile and install just like any other
+     // .rpm or .deb package.
+ 
+-    strncpy( linux_configPath, PREFIX "/etc/egoboo-2.x",         SDL_arraysize( linux_configPath ) );
+-    strncpy( linux_binaryPath, PREFIX "/games/",                  SDL_arraysize( linux_binaryPath ) );
+-    strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
++    strncpy( linux_configPath, "/etc/egoboo",         SDL_arraysize( linux_configPath ) );
++    strncpy( linux_binaryPath, "/usr/bin/",                  SDL_arraysize( linux_binaryPath ) );
++    strncpy( linux_dataPath,   "/usr/share/egoboo", SDL_arraysize( linux_dataPath ) );
+ #else
+     // these are read-only directories
+     strncpy( linux_configPath, "/etc/egoboo-2.x/",         SDL_arraysize( linux_configPath ) );
diff --git a/egoboo.spec b/egoboo.spec
index 67052de..909a2d7 100644
--- a/egoboo.spec
+++ b/egoboo.spec
@@ -11,6 +11,7 @@ Patch0:         egoboo-opts.patch
 Patch1:         egoboo-noenet.patch
 Patch2:         egoboo-enet13.patch
 Patch3:         egoboo-badprint.patch
+Patch4:         egoboo-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_ttf-devel SDL_image-devel enet-devel
 BuildRequires:  desktop-file-utils
@@ -30,6 +31,7 @@ dimension.
 %patch1 -b .noenet
 %patch2 -b .enet13
 %patch3 -b .badprint
+%patch4 -b .paths
 
 %build
 make -C src


More information about the scm-commits mailing list