From e26542feff2003d083f745ea74c3e45cd8329a63 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Dec 06 2008 04:23:08 +0000 Subject: Fix for 2.6 --- diff --git a/cyphesis-0.5.17-py26.patch b/cyphesis-0.5.17-py26.patch new file mode 100644 index 0000000..48ccbc5 --- /dev/null +++ b/cyphesis-0.5.17-py26.patch @@ -0,0 +1,23 @@ +diff -up cyphesis-0.5.17/configure.ac.py26 cyphesis-0.5.17/configure.ac +--- cyphesis-0.5.17/configure.ac.py26 2008-12-05 21:39:01.000000000 -0500 ++++ cyphesis-0.5.17/configure.ac 2008-12-05 21:44:01.000000000 -0500 +@@ -161,6 +161,11 @@ dnl + dnl if found define HAVE_PYTHON_H + dnl + ++AC_CHECK_HEADER(python2.6/Python.h, ++[ ++ python_include_path=-I${python_prefix}/include/python2.6 ++ python_version=2.6 ++],[ + AC_CHECK_HEADER(python2.5/Python.h, + [ + python_include_path=-I${python_prefix}/include/python2.5 +@@ -190,6 +195,7 @@ Python. If Python is installed somewhere + ]) + ]) + ]) ++]) + + PYTHON_VERSION=${python_version} + PYTHON_INCLUDES=${python_include_path} diff --git a/cyphesis.spec b/cyphesis.spec index 1a795b8..cbb1bfc 100644 --- a/cyphesis.spec +++ b/cyphesis.spec @@ -18,10 +18,12 @@ Patch0: cyphesis-0.5.17-init.patch Patch1: cyphesis-0.5.11-logdir.patch Patch3: cyphesis-0.5.17-sockpath.patch Patch4: cyphesis-0.5.17-gcrypt-init-fix.patch +Patch5: cyphesis-0.5.17-py26.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel libgcrypt-devel pkgconfig atlascpp-devel BuildRequires: varconf-devel libsigc++20-devel mercator-devel skstream-devel BuildRequires: postgresql-devel readline-devel avahi-devel +BuildRequires: autoconf automake Requires: postgresql-server Requires(pre): shadow-utils @@ -54,6 +56,7 @@ Logwatch scripts for the WorldForge game server. %patch1 -p0 %patch3 -p1 %patch4 -p0 +%patch5 -p1 -b .py26 chmod a-x rulesets/basic/mind/dictlist.py chmod a-x rulesets/mason/world/objects/buildings/House.py @@ -74,6 +77,7 @@ echo "LOAD_RULES=1" >> cyphesis.sysconfig %build +autoreconf -i %configure make %{?_smp_mflags}