Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv8730 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Removed Files: xbmc-10-disable-snes.patch Log Message: - Rebase to Dharma rc1 (SVN r35326) - Remove conditionals on {librtmp,libbluray}-devel: now present in all currently supported releases (f13+) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Nov 2010 22:38:38 -0000 1.6 +++ .cvsignore 20 Nov 2010 00:38:43 -0000 1.7 @@ -1 +1 @@ -xbmc-Dharma_beta4-patched.tar.xz +xbmc-Dharma_rc1-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Nov 2010 22:38:38 -0000 1.6 +++ sources 20 Nov 2010 00:38:43 -0000 1.7 @@ -1 +1 @@ -d31facaa46d2986877ea50929ad40667 xbmc-Dharma_beta4-patched.tar.xz +d0102d9f22dbbd9a6bb3b1386f00f971 xbmc-Dharma_rc1-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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xbmc-generate-tarball-xz.sh 7 Nov 2010 22:38:38 -0000 1.5 +++ xbmc-generate-tarball-xz.sh 20 Nov 2010 00:38:43 -0000 1.6 @@ -9,12 +9,12 @@ #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-35068} +SVNVERSION=${1-35326} # uncomment following if you want to always pull from tip of branch # SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) #VERSION=$MAJORVERSION-$SVNVERSION -VERSION=Dharma_beta4 +VERSION=Dharma_rc1 # remove existing checkout rm -r xbmc-$VERSION Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xbmc.spec 19 Nov 2010 10:20:45 -0000 1.19 +++ xbmc.spec 20 Nov 2010 00:38:43 -0000 1.20 @@ -1,12 +1,12 @@ -%global SVNVERSION 35068 -%global PRERELEASE Dharma_beta4 +%global SVNVERSION 35326 +%global PRERELEASE Dharma_rc1 # use below for SVN snapshot #global DIRVERSION %{version}-%{SVNVERSION} %global DIRVERSION %{PRERELEASE} Name: xbmc Version: 10.0 -Release: 0.20.%{PRERELEASE}%{?dist}.1 +Release: 0.21.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -124,12 +124,8 @@ %else BuildRequires: gettext %endif -%if 0%{?fedora} >= 14 BuildRequires: librtmp-devel -%endif -%if 0%{?fedora} >= 15 BuildRequires: libbluray-devel -%endif # VAAPI currently not working, comment-out #BuildRequires: libva-freeworld-devel @@ -213,6 +209,11 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Fri Nov 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.21.Dharma_rc1 +- Rebase to Dharma rc1 (SVN r35326) +- Remove conditionals on {librtmp,libbluray}-devel: now present in all + currently supported releases (f13+) + * Thu Nov 18 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 10.0-0.20.Dharma_beta4.1 - Rebuilt for libmicrohttpd - ABI bump https://admin.fedoraproject.org/updates/libmicrohttpd-0.9.2-3.fc14 --- xbmc-10-disable-snes.patch DELETED ---