Author: peroyvind
Date: Fri Feb 2 20:42:44 2007
New Revision: 115990
Added:
packages/cooker/kiki/current/SOURCES/kiki-1.0.2-define-path.patch
Modified:
packages/cooker/kiki/current/SPECS/kiki.spec
Log:
rather define data path in source than rely on wrapper (P4)
Added: packages/cooker/kiki/current/SOURCES/kiki-1.0.2-define-path.patch
==============================================================================
--- (empty file)
+++ packages/cooker/kiki/current/SOURCES/kiki-1.0.2-define-path.patch Fri Feb
2 20:42:44 2007
@@ -0,0 +1,24 @@
+--- kiki/src/main/KikiController.cpp~ 2005-11-10 22:26:35.000000000 +0100
++++ kiki/src/main/KikiController.cpp 2007-02-02 15:00:58.000000000 +0100
+@@ -54,6 +54,8 @@ KikiController::KikiController () : KEve
+ kiki_home = "./";
+ quit_key = "META_q";
+ gamma = 1;
++#elif defined(KIKI_HOME)
++ kiki_home = KIKI_HOME;
+ #else
+ char * kiki_home_env = getenv("KIKI_HOME");
+ if (kiki_home_env)
+--- kiki/linux/Makefile~ 2007-02-02 19:09:38.000000000 +0100
++++ kiki/linux/Makefile 2007-02-02 19:10:37.000000000 +0100
+@@ -46,7 +46,9 @@ KIKI_INCLUDES = -I ../SWIG $(KODILIBINC)
+ -I $(KIKISRC)/base -I $(KIKISRC)/bots -I $(KIKISRC)/gui -I
$(KIKISRC)/items \
+ -I $(KIKISRC)/main -I $(KIKISRC)/sound -I $(KIKISRC)/world \
+
+-INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
++KIKI_DATADIR = -DKIKI_HOME='"$(KIKI_HOME)/"'
++
++INCLUDES = $(KIKI_INCLUDES) $(KIKI_DATADIR) $(X11_INCLUDES) $(PYTHON_INCLUDES)
+
+ CXXFLAGS = $(INCLUDES) $(SDLCFLAGS) $(OPTFLAGS)
+
Modified: packages/cooker/kiki/current/SPECS/kiki.spec
==============================================================================
--- packages/cooker/kiki/current/SPECS/kiki.spec (original)
+++ packages/cooker/kiki/current/SPECS/kiki.spec Fri Feb 2 20:42:44 2007
@@ -18,6 +18,7 @@
Patch1: kiki-1.0.2-python-dynling-fix.patch
Patch2: kiki-1.0.2-gcc4-fix.patch
Patch3: kiki-1.0.2-python2.5-fix.patch
+Patch4: kiki-1.0.2-define-path.patch
License: Public Domain
Group: Games/Puzzles
Summary: %{Summary}
@@ -37,23 +38,18 @@
%patch1 -p1 -b .dynlink
%patch2 -p1 -b .gcc4
%patch3 -p1 -b .python2.5
+%patch4 -p1 -b .path
bzcat %{SOURCE2} > story.txt
rm -rf `find -type d -name CVS`
%build
cd kodilib/linux; %make OPTFLAGS="%{optflags}" PYTHONHOME=%{py_platlibdir}; cd
-
-cd linux; %make OPTFLAGS="%{optflags}" PYTHON_VERSION=%{python_version}
PYTHONHOME=%{py_platlibdir} GLLIBS="-lglut -lGLU -lGL"; cd -
+cd linux; %make OPTFLAGS="%{optflags}" KIKI_HOME="%{_gamesdatadir}/%{name}"
PYTHON_VERSION=%{python_version} PYTHONHOME=%{py_platlibdir} GLLIBS="-lglut
-lGLU -lGL"; cd -
%install
rm -rf %{buildroot}
-install -m755 linux/%{name} -D %{buildroot}%{_gamesbindir}/%{name}.bin
-
-cat <<EOF > %{buildroot}%{_gamesbindir}/%{name}
-#!/bin/sh
-export KIKI_HOME="%{_gamesdatadir}/%{name}"
-%{_gamesbindir}/%{name}.bin $@
-EOF
+install -m755 linux/%{name} -D %{buildroot}%{_gamesbindir}/%{name}
install -d %{buildroot}%{_gamesdatadir}/%{name}
cp -r sound py %{buildroot}%{_gamesdatadir}/%{name}
