rpms/xbmc/devel xbmc-9.11-python2.7.patch, 1.1, 1.2 xbmc.spec, 1.7, 1.8

[Alex Lancaster]

Author: alexlan

Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15454

Modified Files:
	xbmc-9.11-python2.7.patch xbmc.spec 
Log Message:
Fix python 2.7 patch


xbmc-9.11-python2.7.patch:
 configure.in                                         |   12 ++++++++----
 xbmc/lib/libPython/XBPyThread.cpp                    |    5 ++++-
 xbmc/lib/libPython/XBPyThread.h                      |    4 +++-
 xbmc/lib/libPython/XBPython.cpp                      |    4 +++-
 xbmc/lib/libPython/linux/Makefile.in                 |    5 ++++-
 xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h      |    4 +++-
 xbmc/lib/libPython/xbmcmodule/PythonPlayer.h         |    4 +++-
 xbmc/lib/libPython/xbmcmodule/PythonSettings.h       |    4 +++-
 xbmc/lib/libPython/xbmcmodule/action.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/control.h              |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlbutton.cpp      |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp   |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp   |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlgroup.cpp       |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlimage.cpp       |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controllabel.cpp       |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controllist.cpp        |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlprogress.cpp    |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controlspin.cpp        |    4 +++-
 xbmc/lib/libPython/xbmcmodule/controltextbox.cpp     |    4 +++-
 xbmc/lib/libPython/xbmcmodule/dialog.cpp             |    4 +++-
 xbmc/lib/libPython/xbmcmodule/dialog.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/infotagmusic.h         |    4 +++-
 xbmc/lib/libPython/xbmcmodule/infotagvideo.h         |    4 +++-
 xbmc/lib/libPython/xbmcmodule/keyboard.h             |    4 +++-
 xbmc/lib/libPython/xbmcmodule/language.h             |    4 +++-
 xbmc/lib/libPython/xbmcmodule/listitem.cpp           |    4 +++-
 xbmc/lib/libPython/xbmcmodule/listitem.h             |    4 +++-
 xbmc/lib/libPython/xbmcmodule/player.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp         |    4 +++-
 xbmc/lib/libPython/xbmcmodule/pyplaylist.h           |    4 +++-
 xbmc/lib/libPython/xbmcmodule/pyutil.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/window.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/winxml.cpp             |    4 +++-
 xbmc/lib/libPython/xbmcmodule/winxml.h               |    4 +++-
 xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp       |    4 +++-
 xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp      |    5 ++++-
 xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp         |    4 +++-
 39 files changed, 125 insertions(+), 42 deletions(-)

Index: xbmc-9.11-python2.7.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-9.11-python2.7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-9.11-python2.7.patch	30 Aug 2010 02:57:12 -0000	1.1
+++ xbmc-9.11-python2.7.patch	30 Aug 2010 07:09:17 -0000	1.2
@@ -495,6 +495,36 @@
      #include <python2.6/Python.h>
    #elif (defined HAVE_LIBPYTHON2_5)
      #include <python2.5/Python.h>
+Index: xbmc/lib/libPython/xbmcmodule/language.h
+===================================================================
+--- xbmc/lib/libPython/xbmcmodule/language.h.orig	2010-08-30 02:53:36.545418596 -0400
++++ xbmc/lib/libPython/xbmcmodule/language.h	2010-08-30 02:54:07.381668564 -0400
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
+Index: xbmc/lib/libPython/xbmcmodule/PythonSettings.h
+===================================================================
+--- xbmc/lib/libPython/xbmcmodule/PythonSettings.h.orig	2010-08-30 03:02:55.131669137 -0400
++++ xbmc/lib/libPython/xbmcmodule/PythonSettings.h	2010-08-30 03:03:18.218294899 -0400
+@@ -25,7 +25,9 @@
+   #include "config.h"
+ #endif
+ #if (defined USE_EXTERNAL_PYTHON)
+-  #if (defined HAVE_LIBPYTHON2_6)
++  #if (defined HAVE_LIBPYTHON2_7)
++    #include <python2.7/Python.h>
++  #elif (defined HAVE_LIBPYTHON2_6)
+     #include <python2.6/Python.h>
+   #elif (defined HAVE_LIBPYTHON2_5)
+     #include <python2.5/Python.h>
 Index: xbmc/lib/libPython/XBPyThread.h
 ===================================================================
 --- xbmc/lib/libPython/XBPyThread.h	(revision 32022)


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xbmc.spec	30 Aug 2010 02:57:12 -0000	1.7
+++ xbmc.spec	30 Aug 2010 07:09:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name: xbmc
 Version: 9.11
-Release: 20%{?dist}
+Release: 21%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{version}-patched.tar.xz
@@ -242,6 +242,9 @@
 %{_datadir}/pixmaps/xbmc.png
 
 %changelog
+* Mon Aug 30 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-21
+- Fix python 2.7 patch
+
 * Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20
 - Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6
   as per: http://forum.xbmc.org/showthread.php?t=75800