- merged from DEVEL

Changed files:
    xbmc-fpsrate.patch -> 1.2
    xbmc-nobash.patch -> 1.3
    xbmc-python27.patch -> 1.5
    xbmc-subtitle_tags.patch -> 1.4
    xbmc.spec -> 1.30

diff --git a/xbmc-fpsrate.patch b/xbmc-fpsrate.patch
deleted file mode 100644 (file)
index 8221466..0000000
--- a/xbmc-fpsrate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xbmc-10.0/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp.orig     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp  2011-02-04 22:05:12.000000000 +0100
-@@ -48,7 +48,11 @@
-   CLog::Log(LOGDEBUG, "%s - framerate %d:%d", __FUNCTION__, hints.fpsrate, hints.fpsscale);
-   if (hints.fpsscale > 0 && hints.fpsrate > 0)
-   {
--    m_framerate = (double)hints.fpsscale / (double)hints.fpsrate;
-+    double fpsrate = (double)hints.fpsrate;
-+    if (hints.fpsrate == 24)
-+      fpsrate = 23.976125;
-+
-+    m_framerate = (double)hints.fpsscale / fpsrate;
-     m_framerate *= DVD_TIME_BASE;
-   }
-   else

diff --git a/xbmc-nobash.patch b/xbmc-nobash.patch
deleted file mode 100644 (file)
index b1de42b..0000000
--- a/xbmc-nobash.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
---- xbmc-10.0.orig/configure.in        2010-12-21 18:31:22.222999999 +0100
-+++ xbmc-10.0/configure.in     2010-12-21 19:07:25.468000001 +0100
-@@ -248,7 +248,7 @@
- 
- AC_ARG_ENABLE([hal],
-   [AS_HELP_STRING([--disable-hal],
--  [disable HAL support (default is enabled if hal and hal-storage is found)])],
-+  [disable HAL support (default is enabled if hal and hal-storage is founC_CONFIG_COMMANDS_POSTd)])],
-   [use_hal=$enableval],
-   [use_hal=yes])
- 
-@@ -553,48 +553,48 @@
- AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
- PKG_CHECK_MODULES([MAD],        [mad],
--  [INCLUDES="$INCLUDES $MAD_CFLAGS"; LIBS="$LIBS $MAD_LIBS"],
-+  [INCLUDES="${INCLUDES} $MAD_CFLAGS"; LIBS="${LIBS} $MAD_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
--  [INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="$LIBS $FONTCONFIG_LIBS"],
-+  [INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="${LIBS} $FONTCONFIG_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([FRIBIDI],    [fribidi],
--  [INCLUDES="$INCLUDES $FRIBIDI_CFLAGS"; LIBS="$LIBS $FRIBIDI_LIBS"],
-+  [INCLUDES="${INCLUDES} $FRIBIDI_CFLAGS"; LIBS="${LIBS} $FRIBIDI_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([SQLITE3],    [sqlite3],
--  [INCLUDES="$INCLUDES $SQLITE3_CFLAGS"; LIBS="$LIBS $SQLITE3_LIBS"],
-+  [INCLUDES="${INCLUDES} $SQLITE3_CFLAGS"; LIBS="${LIBS} $SQLITE3_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([PNG],        [libpng],
--  [INCLUDES="$INCLUDES $PNG_CFLAGS"; LIBS="$LIBS $PNG_LIBS"],
-+  [INCLUDES="${INCLUDES} $PNG_CFLAGS"; LIBS="${LIBS} $PNG_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([PCRE],       [libpcre],
--  [INCLUDES="$INCLUDES $PCRE_CFLAGS"; LIBS="$LIBS $PCRE_LIBS"]; \
-+  [INCLUDES="${INCLUDES} $PCRE_CFLAGS"; LIBS="${LIBS} $PCRE_LIBS"]; \
-   AC_DEFINE([HAVE_LIBPCRE],[1],["Define to 1 if libpcre is installed"]),
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([PCRECPP],    [libpcrecpp],
--  [INCLUDES="$INCLUDES $PCRECPP_CFLAGS"; LIBS="$LIBS $PCRECPP_LIBS"]; \
-+  [INCLUDES="${INCLUDES} $PCRECPP_CFLAGS"; LIBS="${LIBS} $PCRECPP_LIBS"]; \
-   AC_DEFINE([HAVE_LIBPCRECPP],[1],["Define to 1 if libpcrecpp is installed"]),
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([CDIO],       [libcdio],
--  [INCLUDES="$INCLUDES $CDIO_CFLAGS"; LIBS="$LIBS $CDIO_LIBS"],
-+  [INCLUDES="${INCLUDES} $CDIO_CFLAGS"; LIBS="${LIBS} $CDIO_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
--  [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
-+  [INCLUDES="${INCLUDES} $SAMPLERATE_CFLAGS"; LIBS="${LIBS} $SAMPLERATE_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([MMS],        [libmms],
--  [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"],
-+  [INCLUDES="${INCLUDES} $MMS_CFLAGS"; LIBS="${LIBS} $MMS_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([FREETYPE2],  [freetype2],
--  [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
-+  [INCLUDES="${INCLUDES} $FREETYPE2_CFLAGS"; LIBS="${LIBS} $FREETYPE2_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([OGG],        [ogg],
--  [INCLUDES="$INCLUDES $OGG_CFLAGS"; LIBS="$LIBS $OGG_LIBS"],
-+  [INCLUDES="${INCLUDES} $OGG_CFLAGS"; LIBS="${LIBS} $OGG_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([VORBIS],     [vorbis],
--  [INCLUDES="$INCLUDES $VORBIS_CFLAGS"; LIBS="$LIBS $VORBIS_LIBS"],
-+  [INCLUDES="${INCLUDES} $VORBIS_CFLAGS"; LIBS="${LIBS} $VORBIS_LIBS"],
-   AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([VORBISENC],     [vorbisenc],
--  [INCLUDES="$INCLUDES $VORBISENC_CFLAGS"; LIBS="$LIBS $VORBISENC_LIBS"],
-+  [INCLUDES="${INCLUDES} $VORBISENC_CFLAGS"; LIBS="${LIBS} $VORBISENC_LIBS"],
-   AC_MSG_ERROR($missing_library))
- 
- # check for libbluray
-@@ -608,7 +608,7 @@
- 
- AS_CASE([x$use_libbluray],
-   [xyes],[
--    INCLUDES="$INCLUDES $LIBBLURAY_CFLAGS";
-+    INCLUDES="${INCLUDES} $LIBBLURAY_CFLAGS";
-     if test "$host_vendor" != "apple"; then
-       XB_FIND_SONAME([BLURAY], [bluray], [use_libbluray])
-     fi;
-@@ -626,13 +626,13 @@
-   AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
-   AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([VORBISFILE],     [vorbisfile],
--    [INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
-+    [INCLUDES="${INCLUDES} $VORBISFILE_CFLAGS"; LIBS="${LIBS} $VORBISFILE_LIBS"],
-     AC_MSG_ERROR($missing_library))
- else
-   AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
-   if test $MYSQL_CONFIG = "yes"; then
--    INCLUDES="$INCLUDES `mysql_config --include`"
--    LIBS="$LIBS `mysql_config --libs`"
-+    INCLUDES="${INCLUDES} `mysql_config --include`"
-+    LIBS="${LIBS} `mysql_config --libs`"
-   else
-     AC_MSG_ERROR($missing_program)
-   fi
-@@ -652,34 +652,34 @@
-   AC_CHECK_LIB([SDL_image],  [main],, AC_MSG_ERROR($missing_library))
-   
-   PKG_CHECK_MODULES([ALSA],  [alsa],
--    [INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"],
-+    [INCLUDES="${INCLUDES} $ALSA_CFLAGS"; LIBS="${LIBS} $ALSA_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([ENCA],  [enca],
--    [INCLUDES="$INCLUDES $ENCA_CFLAGS"; LIBS="$LIBS $ENCA_LIBS"],
-+    [INCLUDES="${INCLUDES} $ENCA_CFLAGS"; LIBS="${LIBS} $ENCA_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([XT],    [xt],
--    [INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
-+    [INCLUDES="${INCLUDES} $XT_CFLAGS"; LIBS="${LIBS} $XT_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([XTST],  [xtst],
--    [INCLUDES="$INCLUDES $XTST_CFLAGS"; LIBS="$LIBS $XTST_LIBS"],
-+    [INCLUDES="${INCLUDES} $XTST_CFLAGS"; LIBS="${LIBS} $XTST_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([XEXT],  [xext],
--    [INCLUDES="$INCLUDES $XEXT_CFLAGS"; LIBS="$LIBS $XEXT_LIBS"],
-+    [INCLUDES="${INCLUDES} $XEXT_CFLAGS"; LIBS="${LIBS} $XEXT_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([XMU],   [xmu],
--    [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
-+    [INCLUDES="${INCLUDES} $XMU_CFLAGS"; LIBS="${LIBS} $XMU_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([XINERAMA],[xinerama],
--    [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
-+    [INCLUDES="${INCLUDES} $XINERAMA_CFLAGS"; LIBS="${LIBS} $XINERAMA_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([CURL],  [libcurl],
--    [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
-+    [INCLUDES="${INCLUDES} $CURL_CFLAGS"; LIBS="${LIBS} $CURL_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([DBUS],  [dbus-1],
--    [INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"],
-+    [INCLUDES="${INCLUDES} $DBUS_CFLAGS"; LIBS="${LIBS} $DBUS_LIBS"],
-     AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([SDL],   [sdl],
--    [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"],
-+    [INCLUDES="${INCLUDES} $SDL_CFLAGS"; LIBS="${LIBS} $SDL_LIBS"],
-     AC_MSG_ERROR($missing_library))
- fi
- 
-@@ -754,10 +754,10 @@
- else
-   if test "$use_hal" = "yes"; then
-     PKG_CHECK_MODULES([HAL], [hal],
--      [INCLUDES="$INCLUDES $HAL_CFLAGS"; LIBS="$LIBS $HAL_LIBS"],
-+      [INCLUDES="${INCLUDES} $HAL_CFLAGS"; LIBS="${LIBS} $HAL_LIBS"],
-       use_hal=no;AC_MSG_RESULT($hal_not_found))
-     PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage],
--      [INCLUDES="$INCLUDES $HAL_STORAGE_CFLAGS"; LIBS="$LIBS $HAL_STORAGE_LIBS"],
-+      [INCLUDES="${INCLUDES} $HAL_STORAGE_CFLAGS"; LIBS="${LIBS} $HAL_STORAGE_LIBS"],
-       use_hal=no;AC_MSG_RESULT($halstorage_not_found))
-   else
-     AC_MSG_RESULT($hal_disabled)
-@@ -836,7 +836,7 @@
- # External FFmpeg
- if test "$use_external_ffmpeg" = "yes"; then
-   PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat libavutil libpostproc libswscale],
--                    [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"],
-+                    [INCLUDES="${INCLUDES} $FFMPEG_CFLAGS"; LIBS="${LIBS} $FFMPEG_LIBS"],
-                     AC_MSG_ERROR($missing_library))
- 
-   # Determine whether AVPacket and relevant functions are defined in libavformat
-@@ -1055,7 +1055,7 @@
-       AC_DEFINE([HAVE_LIBOPENMAX], [1], [Define to 1 if you have the 'OpenMax' library.]),
-       use_openmax=no;AC_MSG_RESULT($openmax_not_found))
-     if test "$use_openmax" = "yes"; then
--      INCLUDES="$INCLUDES -I/usr/include/OpenMAX/IL"
-+      INCLUDES="${INCLUDES} -I/usr/include/OpenMAX/IL"
-     fi
-   else
-     AC_MSG_NOTICE($openmax_disabled)
-@@ -1219,9 +1219,9 @@
- fi
- 
- if test -d "/usr/include/lzo"; then
--  INCLUDES="$INCLUDES -I/usr/include/lzo"
-+  INCLUDES="${INCLUDES} -I/usr/include/lzo"
- else
--  INCLUDES="$INCLUDES"
-+  INCLUDES="${INCLUDES}"
- fi
- 
- if test "x$use_ccache" != "xno"; then

diff --git a/xbmc-python27.patch b/xbmc-python27.patch
deleted file mode 100644 (file)
index ed3e813..0000000
--- a/xbmc-python27.patch
+++ /dev/null
@@ -1,668 +0,0 @@
-diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
---- xbmc-10.0.orig/configure.in        2010-12-22 20:53:28.933000073 +0100
-+++ xbmc-10.0/configure.in     2010-12-22 21:46:29.535000096 +0100
-@@ -919,7 +919,11 @@
- 
- # External Python
- if test "$use_external_python" = "yes"; then
--  AC_CHECK_LIB([python2.6], [main],
-+  AC_CHECK_LIB([python2.7], [main],
-+    [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
-+    [Define to 1 if you have the 'python2.7' library.])
-+    USE_PYTHON2_7=1],
-+  [AC_CHECK_LIB([python2.6], [main],
-     [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
-     [Define to 1 if you have the 'python2.6' library.])
-     USE_PYTHON2_6=1],
-@@ -931,9 +935,10 @@
-     [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
-     [Define to 1 if you have the 'python2.4' library.])
-     USE_PYTHON2_4=1],
--  [AC_MSG_ERROR($missing_library)] )] )] )
-+  [AC_MSG_ERROR($missing_library)] )] )] )] )
- 
-   AC_MSG_NOTICE($external_python_enabled)
-+  test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
-   test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
-   test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
-   test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
-@@ -1491,6 +1496,7 @@
- AC_SUBST(USE_EXTERNAL_LIBMPEG2)
- AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
- AC_SUBST(USE_EXTERNAL_PYTHON)
-+AC_SUBST(USE_PYTHON2_7)
- AC_SUBST(USE_PYTHON2_6)
- AC_SUBST(USE_PYTHON2_5)
- AC_SUBST(USE_PYTHON2_4)
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in
---- xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in     2010-12-22 21:46:29.566000076 +0100
-@@ -5,7 +5,10 @@
- SHELL=/bin/bash
- SYSDIR=../../../../system/python
- 
--ifeq (@USE_PYTHON2_6@,1)
-+ifeq (@USE_PYTHON2_7@,1)
-+    PYVERSION=python2.7
-+    SO=python27-$(ARCH).so
-+else ifeq (@USE_PYTHON2_6@,1)
-     PYVERSION=python2.6
-     SO=python26-$(ARCH).so
- else ifeq (@USE_PYTHON2_5@,1)
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h   2010-12-22 21:46:29.566000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp  2010-12-22 21:46:29.567000079 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp  2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp       2010-12-22 21:46:29.567000079 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp  2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp       2010-12-22 21:46:29.568000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp   2010-12-22 21:46:29.568000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h  2010-12-22 21:46:29.569000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp   2010-12-22 21:46:29.569000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp   2010-12-22 21:46:29.570000079 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp       2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp    2010-12-22 21:46:29.571000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp   2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp        2010-12-22 21:46:29.572000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp     2010-12-22 21:46:29.572000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp  2010-12-22 21:46:29.572000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp       2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp    2010-12-22 21:46:29.572000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp    2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-22 21:46:29.572000076 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp    2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-22 21:46:29.572000076 +0100
-@@ -24,7 +24,9 @@
- #endif
- #include "dialog.h"
- #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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h   2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h  2010-12-22 21:46:29.573000077 +0100
-@@ -26,7 +26,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h     2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h     2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h    2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp  2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp       2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h    2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-22 21:46:29.573000077 +0100
-@@ -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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h   2010-12-22 21:46:29.573000077 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp     2010-12-22 21:46:29.574000079 +0100
-@@ -26,7 +26,9 @@
- #include "Util.h"
- #include "pyplaylist.h"
- #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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h  2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h       2010-12-22 21:46:29.574000079 +0100
-@@ -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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h 2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h      2010-12-22 21:46:29.574000079 +0100
-@@ -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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h     2010-12-22 21:46:29.574000079 +0100
-@@ -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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h   2010-12-22 21:46:29.574000079 +0100
-@@ -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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h   2010-12-22 21:46:29.574000079 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp    2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-22 21:46:29.574000079 +0100
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp   2010-12-22 21:46:29.575000080 +0100
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h      2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h   2010-12-22 21:46:29.575000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp   2010-12-22 21:48:38.245000078 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp        2010-12-22 21:47:26.853999676 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp  2010-12-22 21:46:29.575000080 +0100
-@@ -23,7 +23,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/structmember.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/structmember.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp     2010-12-22 21:46:29.575000080 +0100
-@@ -23,7 +23,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>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp xbmc-10.0/xbmc/lib/libPython/XBPython.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp  2010-12-22 21:46:29.576000080 +0100
-@@ -24,7 +24,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>
-@@ -61,7 +63,9 @@
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
-@@ -69,7 +73,9 @@
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
- #endif
- #elif defined(_POWERPC)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
-@@ -77,7 +83,9 @@
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
- #endif
- #elif defined(_POWERPC64)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
-@@ -85,7 +93,9 @@
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
- #endif
- #elif defined(_ARMEL)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
-@@ -93,7 +103,9 @@
- #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
- #endif
- #else /* !__x86_64__ && !__powerpc__ */
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp  2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp       2010-12-22 21:46:29.576000080 +0100
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S       2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S    2010-12-22 21:46:29.576000080 +0100
-@@ -2,7 +2,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp   2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp        2010-12-22 21:46:29.576000080 +0100
-@@ -24,7 +24,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/osdefs.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/osdefs.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h xbmc-10.0/xbmc/lib/libPython/XBPyThread.h
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h     2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h  2010-12-22 21:46:29.576000080 +0100
-@@ -26,7 +26,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>

diff --git a/xbmc-subtitle_tags.patch b/xbmc-subtitle_tags.patch
deleted file mode 100644 (file)
index e33de81..0000000
--- a/xbmc-subtitle_tags.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- xbmc-10.0/xbmc/GUIWindowFullScreen.cpp.orig        2010-12-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/GUIWindowFullScreen.cpp     2011-02-04 22:05:15.000000000 +0100
-@@ -47,9 +47,11 @@
- #include "LocalizeStrings.h"
- #include "utils/SingleLock.h"
- #include "utils/log.h"
-+#include "utils/RegExp.h"
- #include "utils/TimeUtils.h"
- #include "DateTime.h"
- #include "ButtonTranslator.h"
-+#include "StringUtils.h"
- 
- #include <stdio.h>
- 
-@@ -855,6 +857,58 @@
-       subtitleText.Replace("</b", "[/B]");
-       subtitleText.Replace("</u", "");
- 
-+      subtitleText.Replace("{y:u:}", "");
-+      subtitleText.Replace("{y:u}", "");
-+      CStdString strTag;
-+      CRegExp reg(true);
-+      if (reg.RegComp("({y:i})"))
-+      {
-+          if (reg.RegFind(subtitleText) >= 0)
-+          {
-+              strTag = reg.GetMatch(1);
-+              subtitleText.Replace(strTag, "[I]");
-+              subtitleText += "[/I]";
-+          }
-+      }
-+      if (reg.RegComp("({y:b})"))
-+      {
-+          if (reg.RegFind(subtitleText) >= 0)
-+          {
-+              strTag = reg.GetMatch(1);
-+              subtitleText.Replace(strTag, "[B]");
-+              subtitleText += "[/B]";
-+          }
-+      }
-+
-+      bool bChange = false;
-+      int iPos;
-+      reg.RegComp("({c:\\$).+}");
-+      CStdStringArray aLines;
-+      StringUtils::SplitString(subtitleText, "[CR]", aLines);
-+      for (unsigned int i=0; i < aLines.size(); ++i)
-+      {
-+          if (aLines[i].IsEmpty())
-+              continue;
-+
-+          if (aLines[i].GetAt(0) == '/')
-+          {
-+              aLines[i].Delete(0);
-+              aLines[i] = "[I]" + aLines[i] + "[/I]";
-+              bChange = true;
-+          }
-+          if ( (iPos = reg.RegFind(aLines[i])) >= 0)
-+          {
-+              strTag = reg.GetMatch(1);
-+              aLines[i].Replace(strTag, "[COLOR FF");
-+              iPos = aLines[i].Find("}", iPos);
-+              aLines[i].SetAt(iPos, ']');
-+              aLines[i] += "[/COLOR]";
-+              bChange = true;
-+          }
-+      }
-+      if (bChange)
-+          StringUtils::JoinString(aLines, "[CR]", subtitleText);
-+
-       RESOLUTION res = g_graphicsContext.GetVideoResolution();
-       g_graphicsContext.SetRenderingResolution(res, false);
- 

diff --git a/xbmc.spec b/xbmc.spec
index 7405a0500ec1eff7e8c15ff03610cf3cd8187ab8..0a2ad844b54e7a6e80c7862835783a752fa04dc3 100644 (file)
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -7,43 +7,35 @@
 #    on XRRSetCrtcGamma function called by SDL_SetVideoMode)
 #  - add and/or fix users/groups permissions
 #  - split to subpackages?
-#  - check how it works with external python libraries
 #
 # Conditional build:
-%bcond_with     external_python
 %bcond_without goom
+%bcond_with    hal
 
 Summary:       XBMC
 Name:          xbmc
-Version:       10.1
-Release:       0.2
+Version:       11.0
+Release:       1
 License:       GPL v3
 Group:         Applications/Multimedia
-Source0:       http://www.softliste.de/xbmc/releases/source/%{name}-%{version}.tar.gz
-# Source0-md5: 391398126cb86a4f6fbd0b7037997d84
-Source1:       goom_icon.png
-# Source1-md5: 8c0ffe2055f2cfde1189687d12a68aa8
+Source0:       http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
+# Source0-md5: 9e8a26ee25173c7268abea7f1d82d428
 URL:           http://xbmc.org
-Patch0:                %{name}-nobash.patch
-Patch1:                %{name}-python27.patch
-Patch2:                %{name}-subtitle_tags.patch
-Patch3:                %{name}-goom_enable.patch
-Patch4:                %{name}-fpsrate.patch
+BuildRequires: Mesa-libGLU-devel
+BuildRequires: OpenGL-devel
+BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
 BuildRequires: SDL_mixer-devel
-BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: avahi-devel
+BuildRequires: bluez-libs-devel >= 4.99
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake
 BuildRequires: curl-devel
 BuildRequires: dbus-devel
-BuildRequires: enca-devel
-BuildRequires: faac-devel
-BuildRequires: faad2-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: flac-devel
 BuildRequires: fontconfig-devel
@@ -54,24 +46,29 @@ BuildRequires:      gettext-autopoint
 BuildRequires: gettext-devel
 BuildRequires: glew-devel
 BuildRequires: gperf
-BuildRequires: gtk+-devel
+%if %{with hal}
 BuildRequires: hal-devel
+%endif
 BuildRequires: jasper-devel
-BuildRequires: libao-devel
+BuildRequires: libass-devel
+BuildRequires: libbluray-devel
 BuildRequires: libcdio-devel
-BuildRequires: libdts-devel
+BuildRequires: libgcrypt-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmad-devel
 BuildRequires: libmicrohttpd-devel
-BuildRequires: libmms-devel
 BuildRequires: libmodplug-devel
 BuildRequires: libmpeg2-devel
 BuildRequires: libogg-devel
+BuildRequires: libplist-devel
 BuildRequires: libpng-devel
+BuildRequires: librtmp-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsmbclient-devel
+BuildRequires: libssh-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
+BuildRequires: libva-devel
 BuildRequires: libvdpau-devel
 BuildRequires: libvorbis-devel
 BuildRequires: lzo-devel
@@ -81,22 +78,38 @@ BuildRequires:      nasm
 %endif
 BuildRequires: openssl-devel
 BuildRequires: pcre-cxx-devel
+BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2.4
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.566
 # used internally
 BuildRequires: sed >= 4.0
 BuildRequires: sqlite3-devel
+BuildRequires: udev-devel
 BuildRequires: unzip
-BuildRequires: wavpack-devel
-BuildRequires: xmms-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: yajl-devel
 BuildRequires: zip
 BuildRequires: zlib-devel
+#https://github.com/sahlberg/libnfs
+#BuildRequires:        libnfs-devel
+#http://sites.google.com/site/alexthepuffin/home
+#BuildRequires:        afpfs-ng-devel
+#http://mirrors.xbmc.org/build-deps/darwin-libs/libshairport-1.2.0.20310_lib.tar.gz
+#https://github.com/albertz/shairport
+#BuildRequires: libshairport
+#http://www.broadcom.com/support/crystal_hd/
+#BuildRequires:        crystalhd-devel
+#http://libcec.pulse-eight.com/
+#BuildRequires:        libcec-devel >= 1.1.0
 Requires:      /usr/bin/glxinfo
 Requires:      SDL >= 1.2.14-5
 Requires:      lsb-release
@@ -107,37 +120,35 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %prep
 %setup -q
-%patch0 -p1
-%undos xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 ./bootstrap
 %configure \
        --disable-debug \
        --enable-external-libraries \
-       --%{?with_external_python:en}%{!?with_external_python:dis}able-external-python \
-       --%{?with_goom:en}%{!?with_goom:dis}able-goom
-%{__make}
+       --enable-udev \
+       --disable-libcec \
+       --disable-libusb \
+       --disable-nfs \
+       --disable-afpclient \
+       --disable-airtunes \
+       --disable-crystalhd \
+       %{__enable_disable goom} \
+       %{__enable_disable hal}
+       
+%{__make} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-       install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xbmc/addons/visualization.goom/icon.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
-
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}