[poker3d/f14/master] renew pytch for python 2.6 to also build with python 2.7

[tomspur]

commit e6427593028a348d174f118ea08079ed9635fc13
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Sat Jul 31 22:52:37 2010 +0200

    renew pytch for python 2.6 to also build with python 2.7

 ...python26.patch => poker3d-1.1.36-python27.patch |   37 ++++++++++++--------
 poker3d.spec                                       |    3 +-
 2 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/poker3d-1.1.36-python26.patch b/poker3d-1.1.36-python27.patch
similarity index 55%
rename from poker3d-1.1.36-python26.patch
rename to poker3d-1.1.36-python27.patch
index e4ba470..80fe831 100644
--- a/poker3d-1.1.36-python26.patch
+++ b/poker3d-1.1.36-python27.patch
@@ -1,32 +1,39 @@
---- config/python.m4.python26~	2006-07-25 11:59:18.000000000 -0700
-+++ config/python.m4	2008-12-02 19:54:21.000000000 -0800
-@@ -42,7 +42,7 @@
-   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.6 python2.5 python2.4 python2.3 python2.2 dnl
- python2.1 python2.0 python1.6 python1.5])
- 
-   m4_if([$1],[],[
---- config/ccpython.m4.python26~	2006-12-31 03:46:51.000000000 -0800
-+++ config/ccpython.m4	2008-12-02 19:56:33.000000000 -0800
+Index: config/ccpython.m4
+===================================================================
+--- config/ccpython.m4
++++ config/ccpython.m4	2010-07-31 22:43:01.920654674 +0200
 @@ -118,7 +118,7 @@
  
  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])
++m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.7 python2.6 python2.5 python2.4 python2.3])
  found_one=''
  _ONE_CC_PYTHON([=2.3], [2_3])
  if test -f "$PYTHON" ; then found_one=$PYTHON ; fi
-@@ -128,6 +128,9 @@
+@@ -128,6 +128,12 @@
  unset PYTHON
  _ONE_CC_PYTHON([=2.5], [2_5])
  if test -f "$PYTHON" ; then found_one=$PYTHON ; fi
 +unset PYTHON
 +_ONE_CC_PYTHON([=2.6], [2_6])
 +if test -f "$PYTHON" ; then found_one=$PYTHON ; fi
++unset PYTHON
++_ONE_CC_PYTHON([=2.7], [2_7])
++if test -f "$PYTHON" ; then found_one=$PYTHON ; fi
  PYTHON=$found_one
  if ! test "$found_one" ; then
     AC_MSG_ERROR([No python development environments found])
+Index: config/python.m4
+===================================================================
+--- config/python.m4
++++ config/python.m4	2010-07-31 22:40:49.168515260 +0200
+@@ -42,7 +42,7 @@
+   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.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[
diff --git a/poker3d.spec b/poker3d.spec
index 9c803a5..e90f838 100644
--- a/poker3d.spec
+++ b/poker3d.spec
@@ -16,7 +16,7 @@ Patch0:         %{name}-1.1.36-64bit.patch
 Patch1:         %{name}-1.1.36-libexec.patch
 Patch2:         %{name}-1.1.36-osg.patch
 Patch3:         %{name}-1.1.36-gcc43.patch
-Patch4:         %{name}-1.1.36-python26.patch
+Patch4:         %{name}-1.1.36-python27.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ImageMagick desktop-file-utils
@@ -167,6 +167,7 @@ fi
 %changelog
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.1.36-19
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+- add patch for building against python 2.7 too (Thomas Spura)
 
 * Mon Jul 05 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.1.36-18
 - Rebuild against OSG-2.8.3.