rpms/pypoker-eval/devel pypoker-eval-135-python26.patch, NONE, 1.1 pypoker-eval.spec, 1.13, 1.14

[Christopher Stone]

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32472/devel

Modified Files:
	pypoker-eval.spec 
Added Files:
	pypoker-eval-135-python26.patch 
Log Message:
add ability to compile with python 2.6

pypoker-eval-135-python26.patch:

--- NEW FILE pypoker-eval-135-python26.patch ---
diff --git a/pypoker-eval/ChangeLog b/pypoker-eval/ChangeLog
index 5f924e0..be70540 100644
--- a/pypoker-eval/ChangeLog
+++ b/pypoker-eval/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-30  Bradley M. Kuhn  <bkuhn at ebb.org>
+
+	* config/python.m4 (AM_PATH_PYTHON): Added python2.6 support.
+
+	* config/ccpython.m4 (ALL_CC_PYTHON): Added python2.6 support.
+
 2008-03-01  Loic Dachary <loic at dachary.org>
 
 	* Release 135.0
diff --git a/pypoker-eval/Makefile.am b/pypoker-eval/Makefile.am
index a9dbb9d..c16df82 100644
--- a/pypoker-eval/Makefile.am
+++ b/pypoker-eval/Makefile.am
@@ -23,6 +20,7 @@
 #
 # Authors:
 #  Loic Dachary <loic at dachary.org>
+#  Bradley M. Kuhn <bkuhn at ebb.org>
 #
 # 
 ACLOCAL_AMFLAGS = -I config
@@ -34,6 +32,14 @@ pythondir = ${pyexecdir}
 python_PYTHON = \
 	pokereval.py
 
+if PYTHON_2_6
+py2_6exec_LTLIBRARIES = _pokereval_2_6.la
+_pokereval_2_6_la_SOURCES = pypokereval.c
+_pokereval_2_6_la_LDFLAGS = -module -no-undefined -version-info 1:0:0
+_pokereval_2_6_la_LIBADD = ${PYTHON2_6_LIBS} ${POKER_EVAL_LIBS}
+_pokereval_2_6_la_CFLAGS = ${PYTHON2_6_CFLAGS} ${POKER_EVAL_CFLAGS} -DPYTHON_VERSION=\"2_6\" -D'VERSION_NAME(w)=w\#\#2_6'
+endif
+
 if PYTHON_2_5
 py2_5exec_LTLIBRARIES = _pokereval_2_5.la
 _pokereval_2_5_la_SOURCES = pypokereval.c
diff --git a/pypoker-eval/config/ccpython.m4 b/pypoker-eval/config/ccpython.m4
index b7f305c..a4eae54 100644
--- a/pypoker-eval/config/ccpython.m4
+++ b/pypoker-eval/config/ccpython.m4
@@ -110,7 +110,7 @@ AM_CONDITIONAL([PYTHON_]$2, [test "$have_python" != "no"])
 
 AC_DEFUN([ALL_CC_PYTHON],
 [ 
-m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.5 python2.4 python2.3])
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.6 python2.5 python2.4 python2.3])
 PYTHONS=''
 found_one=''
 _ONE_CC_PYTHON([=2.3], [2_3])
@@ -121,6 +121,9 @@ if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
 unset PYTHON
 _ONE_CC_PYTHON([=2.5], [2_5])
 if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
+unset PYTHON
+_ONE_CC_PYTHON([=2.6], [2_6])
+if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
 PYTHON=$found_one
 if ! test "$found_one" ; then
    AC_MSG_ERROR([No python development environments found])
diff --git a/pypoker-eval/config/python.m4 b/pypoker-eval/config/python.m4
index e11f501..c8c5e30 100644
--- a/pypoker-eval/config/python.m4
+++ b/pypoker-eval/config/python.m4
@@ -42,7 +42,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
   dnl in 1.5.
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                      [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+                      [python python2 python2.5 python2.6 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0 python1.6 python1.5])
 
   m4_if([$1],[],[


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/pypoker-eval.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pypoker-eval.spec	29 Nov 2008 18:16:53 -0000	1.13
+++ pypoker-eval.spec	1 Dec 2008 21:25:27 -0000	1.14
@@ -2,15 +2,16 @@
 
 Name:           pypoker-eval
 Version:        135.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://pokersource.org/pypoker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
+Patch0:         %{name}-135-python26.patch
 
-BuildRequires:  python-devel poker-eval-devel >= 124.0
+BuildRequires:  libtool python-devel poker-eval-devel >= 124.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -30,6 +31,8 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b .python26~
+autoreconf --force --install
 
 # make examples directory for devel %doc
 mkdir -p tmp/examples
@@ -75,6 +78,9 @@
 
 
 %changelog
+* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3
+- Add patch for python 2.6
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 135.0-2
 - Rebuild for Python 2.6