rpms/poker2d/F-9 poker2d-1.6.0-libtool22.patch, NONE, 1.1 poker2d-1.6.0-python26.patch, NONE, 1.1 poker2d.spec, 1.12, 1.13

[Christopher Stone]

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12492/F-9

Modified Files:
	poker2d.spec 
Added Files:
	poker2d-1.6.0-libtool22.patch poker2d-1.6.0-python26.patch 
Log Message:
add patches to work with python2.6 and libtool2.2

poker2d-1.6.0-libtool22.patch:

--- NEW FILE poker2d-1.6.0-libtool22.patch ---
--- configure.ac.libtool22~	2008-12-02 12:32:56.000000000 -0800
+++ configure.ac	2008-12-02 13:03:58.000000000 -0800
@@ -91,8 +91,9 @@
     # Checks for programs.
     AC_PROG_MAKE_SET
     AC_GNU_SOURCE
-    AC_PROG_CPP
+    AC_PROG_CXX
     AC_PROG_LIBTOOL
+    AM_PROG_CC_C_O
 
     if test "$GXX" = "yes" -a "$ac_test_CXXFLAGS" != set ; then
       if test "$enable_debug" = "yes" ; then

poker2d-1.6.0-python26.patch:

--- NEW FILE poker2d-1.6.0-python26.patch ---
--- config/ccpython.m4.python26~	2008-03-20 07:47:27.000000000 -0700
+++ config/ccpython.m4	2008-12-02 12:32:35.000000000 -0800
@@ -110,7 +110,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])
 PYTHONS=''
 found_one=''
 _ONE_CC_PYTHON([=2.3], [2_3])
@@ -121,6 +121,9 @@
 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])
--- config/python.m4.python26~	2006-07-22 01:45:47.000000000 -0700
+++ config/python.m4	2008-12-02 12:32:35.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],[],[


Index: poker2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-9/poker2d.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- poker2d.spec	29 May 2008 17:25:03 -0000	1.12
+++ poker2d.spec	2 Dec 2008 21:20:11 -0000	1.13
@@ -3,15 +3,18 @@
 
 Name:           poker2d
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pokersource.org/poker-network
 Source0:        http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
+Patch0:         %{name}-1.6.0-python26.patch
+Patch1:         %{name}-1.6.0-libtool22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool gettext cvs
 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
@@ -50,6 +53,9 @@
 
 %prep
 %setup -qn poker-network-%{version}
+%patch0 -p0 -b .python26~
+%patch1 -p0 -b .libtool22~
+autoreconf --force --install
 
 # create poker2d desktop file
 cat > %{name}.desktop << EOF
@@ -209,6 +215,13 @@
 
 
 %changelog
+* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3
+- Add python2.6 patch
+- Add libtool2.2 patch
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0-2
+- Rebuild for Python 2.6
+
 * Thu May 29 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-1
 - Upstream sync