rpms/cyphesis/devel cyphesis-0.5.17-py26.patch, NONE, 1.1 cyphesis.spec, 1.27, 1.28

[Ignacio Vazquez-Abrams]

Author: ivazquez

Update of /cvs/pkgs/rpms/cyphesis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv757

Modified Files:
	cyphesis.spec 
Added Files:
	cyphesis-0.5.17-py26.patch 
Log Message:
Fix for 2.6

cyphesis-0.5.17-py26.patch:

--- NEW FILE cyphesis-0.5.17-py26.patch ---
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}


Index: cyphesis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cyphesis.spec	1 Dec 2008 05:03:45 -0000	1.27
+++ cyphesis.spec	6 Dec 2008 04:23:08 -0000	1.28
@@ -18,10 +18,12 @@
 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 @@
 %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 @@
 
 
 %build
+autoreconf -i
 %configure
 make %{?_smp_mflags}