[poker2d/f14/master] add patch to build with python 2.7
tomspur
tomspur at fedoraproject.org
Sat Jul 31 20:19:18 UTC 2010
commit bef17349cdb9bee82873a08ef893be3569d02c4f
Author: Thomas Spura <tomspur at fedoraproject.org>
Date: Sat Jul 31 22:03:34 2010 +0200
add patch to build with python 2.7
poker2d-1.7.3-python2.7.patch | 35 +++++++++++++++++++++++++++++++++++
poker2d.spec | 8 +++++++-
2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/poker2d-1.7.3-python2.7.patch b/poker2d-1.7.3-python2.7.patch
new file mode 100644
index 0000000..d522c1a
--- /dev/null
+++ b/poker2d-1.7.3-python2.7.patch
@@ -0,0 +1,35 @@
+Index: configure.ac
+===================================================================
+--- configure.ac
++++ configure.ac 2010-07-31 21:55:18.452655426 +0200
+@@ -95,6 +95,7 @@
+ AM_CONDITIONAL([PYTHON_2_4], [false])
+ AM_CONDITIONAL([PYTHON_2_5], [false])
+ AM_CONDITIONAL([PYTHON_2_6], [false])
++ AM_CONDITIONAL([PYTHON_2_7], [false])
+
+ ], [
+ if test "$GXX" = "yes" -a "$ac_test_CXXFLAGS" != set ; then
+Index: config/ccpython.m4
+===================================================================
+--- config/ccpython.m4
++++ config/ccpython.m4 2010-07-31 21:55:40.206529408 +0200
+@@ -111,7 +111,7 @@
+
+ AC_DEFUN([ALL_CC_PYTHON],
+ [
+-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])
+ PYTHONS=''
+ found_one=''
+ _ONE_CC_PYTHON([=2.3], [2_3])
+@@ -125,6 +125,9 @@
+ unset PYTHON
+ _ONE_CC_PYTHON([=2.6], [2_6])
+ if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
++unset PYTHON
++_ONE_CC_PYTHON([=2.7], [2_7])
++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/poker2d.spec b/poker2d.spec
index b5e5604..110b423 100644
--- a/poker2d.spec
+++ b/poker2d.spec
@@ -10,9 +10,11 @@ Group: Amusements/Games
License: GPLv2+
URL: http://pokersource.org/poker-network
Source0: http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
+# patch to build with python 2.7
+Patch0: poker2d-1.7.3-python2.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool gettext cvs
+BuildRequires: libtool gettext-autopoint cvs automake autoconf
BuildRequires: desktop-file-utils hicolor-icon-theme ImageMagick
BuildRequires: apg python-devel poker-engine-devel >= 1.0.21
BuildRequires: glib2-devel libglade2-devel pygtk2-devel pygtk2-libglade
@@ -52,6 +54,9 @@ This package contains files required to build applications that use
%prep
%setup -qn poker-network-%{version}
+%patch0
+autoreconf -fi
+
# create poker2d desktop file
cat > %{name}.desktop << EOF
[Desktop Entry]
@@ -224,6 +229,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.7.3-4
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+- add patch for building with python 2.7 (Thomas Spura)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list