Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7792 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Log Message: Update to 10.1 - Add support for using system python-imaging and pysqlite modules, thanks to Pierre Ossman for patch (#1575) - Drop most references to SVNVERSION, upstream now uses git Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Dec 2010 22:52:06 -0000 1.9 +++ .cvsignore 30 Mar 2011 05:31:36 -0000 1.10 @@ -1 +1 @@ -xbmc-10.0-Dharma-patched.tar.xz +xbmc-10.1-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Dec 2010 22:52:06 -0000 1.9 +++ sources 30 Mar 2011 05:31:36 -0000 1.10 @@ -1 +1 @@ -b3f969d96f4f598352c19e599d3534da xbmc-10.0-Dharma-patched.tar.xz +48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbmc-generate-tarball-xz.sh 23 Dec 2010 22:52:06 -0000 1.8 +++ xbmc-generate-tarball-xz.sh 30 Mar 2011 05:31:36 -0000 1.9 @@ -1,20 +1,18 @@ #!/bin/sh -MAJORVERSION=10.0 +MAJORVERSION=10.1 -# pull from Dharma branch -SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma +# FIXME: need to update to use git +#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma # uncomment this to switch to trunk #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default SVNVERSION=${1-35567} -# uncomment following if you want to always pull from tip of branch -# SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) -VERSION=$MAJORVERSION-Dharma -# SVN snapshot +VERSION=$MAJORVERSION +# git snapshot #VERSION=$MAJORVERSION-$SVNVERSION # pre-release #VERSION=Dharma_rc2 @@ -22,19 +20,14 @@ # remove existing checkout rm -r xbmc-$VERSION -#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION - # don't need to extra tarball, already expanded # comment out with tarball tar -xzvf xbmc-$VERSION.tar.gz -# rename tarball directory -mv -i $VERSION xbmc-$VERSION cd xbmc-$VERSION # remove bundled libraries (including zlib and OSX), saves space and forces using external versions # also remove legally problematic libGoAhead library -#for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun do rm -r xbmc/lib/$i Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xbmc.spec 27 Mar 2011 16:59:32 -0000 1.24 +++ xbmc.spec 30 Mar 2011 05:31:36 -0000 1.25 @@ -1,14 +1,11 @@ -%global SVNVERSION 35648 #global PRERELEASE Dharma_rc2 -%global DIRVERSION %{version}-Dharma -# use below for SVN snapshot -#global DIRVERSION %{version}-%{SVNVERSION} +%global DIRVERSION %{version} # use below for pre-release #global DIRVERSION %{PRERELEASE} Name: xbmc -Version: 10.0 -Release: 2%{?dist} +Version: 10.1 +Release: 1%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -138,6 +135,13 @@ Requires: librtmp Requires: libbluray +# These are just symlinked to, but needed both at build-time +# and for installation +BuildRequires: python-imaging +Requires: python-imaging +BuildRequires: python-sqlite2 +Requires: python-sqlite2 + %description XBMC media center is a free cross-platform media-player jukebox and entertainment hub. XBMC can play a spectrum of of multimedia formats, @@ -174,7 +178,6 @@ --disable-libdts --disable-liba52 \ --disable-dvdcss \ --disable-optimizations --disable-debug \ -SVN_REV=%{SVNVERSION} \ CPPFLAGS="-I/usr/include/ffmpeg" \ CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ @@ -199,6 +202,14 @@ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop +# Normally we are expected to build these manually. But since we are using +# the system Python interpreter, we also want to use the system libraries +install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib +ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL +install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib +ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 + + %clean rm -rf $RPM_BUILD_ROOT @@ -214,6 +225,12 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1 +- Update to 10.1 +- Add support for using system python-imaging and pysqlite modules, thanks to Pierre + Ossman for patch (#1575) +- Drop most references to SVNVERSION, upstream now uses git + * Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 10.0-2 - Rebuild for libmysqlclient