Author: ktdreyer Update of /cvs/free/rpms/xbmc/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29217 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc-pvr-addons-generate-tarball-xz.sh xbmc.spec Removed Files: xbmc-11.0-tsp-Eden-pvr.patch Log Message: * Fri Jan 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.6.Frodo_rc3 - Update to Frodo RC 3 - Update PVR addons snapshot to match snapshot bundled in rc3 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Oct 2012 06:25:59 -0000 1.15 +++ .cvsignore 5 Jan 2013 01:57:47 -0000 1.16 @@ -1 +1,2 @@ -xbmc-12.0-Frodo_alpha6-patched.tar.xz +xbmc-12.0-Frodo_rc3-patched.tar.xz +xbmc-pvr-addons-5f97406cff-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 13 Dec 2012 19:29:49 -0000 1.18 +++ sources 5 Jan 2013 01:57:48 -0000 1.19 @@ -1,2 +1,2 @@ -a6b90c12fde21b99ab0441ec404c62c0 xbmc-12.0-Frodo_rc1-patched.tar.xz -a5162726bdffbbafc7884aff6ef44dd7 xbmc-pvr-addons-1e666ced21-patched.tar.xz +c806f10522f411b0ca433739953c17b1 xbmc-12.0-Frodo_rc3-patched.tar.xz +47a2b90e4bd567540d550c50d7dc372b xbmc-pvr-addons-5f97406cff-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-generate-tarball-xz.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xbmc-generate-tarball-xz.sh 13 Dec 2012 19:29:49 -0000 1.16 +++ xbmc-generate-tarball-xz.sh 5 Jan 2013 01:57:50 -0000 1.17 @@ -2,7 +2,7 @@ MAJORVERSION=12 MINORVERSION=0 -PRERELEASE=Frodo_rc1 +PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} Index: xbmc-pvr-addons-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-pvr-addons-generate-tarball-xz.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-pvr-addons-generate-tarball-xz.sh 13 Dec 2012 19:29:49 -0000 1.1 +++ xbmc-pvr-addons-generate-tarball-xz.sh 5 Jan 2013 01:57:51 -0000 1.2 @@ -5,7 +5,10 @@ # The xbmc-pvr-addon software does not yet use version numbers, so we'll # just use git hashes for identifiers. -GITHASH=1e666ced21 +# Upstream xbmc also hardcodes a Git hash for OSes that bundle +# xbmc-pvr-addons. Let's try using the same hash that upstream uses. It +# can be found in tools/darwin/depends/xbmc-pvr-addons/Makefile. +GITHASH=5f97406cff GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip # download zipball Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- xbmc.spec 13 Dec 2012 19:32:15 -0000 1.55 +++ xbmc.spec 5 Jan 2013 01:57:51 -0000 1.56 @@ -1,11 +1,11 @@ -%global PRERELEASE Frodo_rc1 +%global PRERELEASE Frodo_rc3 #global DIRVERSION %{version} # use the line below for pre-releases %global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc Version: 12.0 -Release: 0.4.%{PRERELEASE}%{?dist}.1 +Release: 0.6.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -20,7 +20,7 @@ Source1: xbmc-generate-tarball-xz.sh # xbmc pvr addons are shipped as a separate git repo. -Source2: xbmc-pvr-addons-1e666ced21-patched.tar.xz +Source2: xbmc-pvr-addons-5f97406cff-patched.tar.xz Source3: xbmc-pvr-addons-generate-tarball-xz.sh # https://github.com/xbmc/xbmc/pull/1725.patch @@ -42,22 +42,6 @@ # functionality, needs to be able fallback internal version Patch4: xbmc-12.0-hdhomerun.patch -# patch pristine Eden source (git tag: 11.0-Eden-r2) against -# tsp42's back-port of PVR support (including MythTV support) -# to stable Eden branch, patch created using the following: -# -# git clone git://github.com/tsp/xbmc.git xbmc-Eden-pvr -# cd xbmc-Eden-pvr/ -# git checkout Eden-pvr -# git remote add main git://github.com/xbmc/xbmc.git -# git fetch main -# git diff 11.0-Eden-r2 Eden-pvr > xbmc-11.0-tsp-Eden-pvr.patch -# -# (note that hunks within patch that patch ffmpeg needed to be -# removed, since ffmpeg is removed from original tarball, and other -# minor tweaks may be needed) -#Patch5: xbmc-11.0-tsp-Eden-pvr.patch - # Optional deps (not in EPEL) # (libbluray in EPEL 6 is too old.) %{?fedora:%global _with_hdhomerun 1} @@ -236,7 +220,6 @@ %patch2 -p0 #patch3 -p0 %patch4 -p1 -#patch5 -p1 %if 0%{?_with_hdhomerun} %else @@ -342,8 +325,18 @@ #%%{_includedir}/xbmc/xbmcclient.h %changelog -* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.4.Frodo_rc1.f18.1 -- Bumping release for bad tag in F18 (sigh) +* Fri Jan 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.6.Frodo_rc3 +- Update to Frodo RC 3 +- Update PVR addons snapshot to match snapshot bundled in rc3 + +* Fri Dec 28 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 12.0-0.5.Frodo_rc2 +- Release number should be bumped on every change when doing + pre-release updates +- Remove obsolete MythTV PVR add-on patch from tsp branch + +* Wed Dec 27 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.4.Frodo_rc2 +- Update to Frodo RC 2 +- Update PVR addons snapshot to the latest Git version * Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.4.Frodo_rc1 - Disable crystalhd on non-x86 (by kwizart) --- xbmc-11.0-tsp-Eden-pvr.patch DELETED ---