diff options
author | Ken Dreyer <ktdreyer@ktdreyer.com> | 2013-01-04 12:02:44 -0700 |
---|---|---|
committer | Ken Dreyer <ktdreyer@ktdreyer.com> | 2013-01-04 12:07:25 -0700 |
commit | 0c19dad8538d47e4f3032611cef4ce1ca86e4b89 (patch) | |
tree | b95dac85867d8a8d406afe5b9403cd4f519b4508 | |
parent | 785165f1c52ac1bf0ff9abec68b911693ffeec82 (diff) | |
download | xbmc-rpm-0c19dad8538d47e4f3032611cef4ce1ca86e4b89.tar.gz xbmc-rpm-0c19dad8538d47e4f3032611cef4ce1ca86e4b89.tar.xz xbmc-rpm-0c19dad8538d47e4f3032611cef4ce1ca86e4b89.zip |
Update to Frodo RC 3 and use newer PVR addons snapshot
- Update to Frodo RC 3
- Update PVR addons snapshot to match snapshot bundled in rc3
-rw-r--r-- | .gitignore | 4 | ||||
-rwxr-xr-x | xbmc-generate-tarball-xz.sh | 2 | ||||
-rwxr-xr-x | xbmc-pvr-addons-generate-tarball-xz.sh | 5 | ||||
-rw-r--r-- | xbmc.spec | 10 |
4 files changed, 14 insertions, 7 deletions
@@ -7,6 +7,6 @@ /xbmc-9.11-patched.tar.xz /xbmc-12.0-Frodo_alpha6-patched.tar.xz /xbmc-12.0-Frodo_alpha7-patched.tar.xz -/xbmc-pvr-addons-e573d80219-patched.tar.xz +/xbmc-pvr-addons-5f97406cff-patched.tar.xz /xbmc-12.0-Frodo_beta2-patched.tar.xz -/xbmc-12.0-Frodo_rc2-patched.tar.xz +/xbmc-12.0-Frodo_rc3-patched.tar.xz diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 8be9cd2..ee511c6 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -2,7 +2,7 @@ MAJORVERSION=12 MINORVERSION=0 -PRERELEASE=Frodo_rc2 +PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} diff --git a/xbmc-pvr-addons-generate-tarball-xz.sh b/xbmc-pvr-addons-generate-tarball-xz.sh index 2965036..b3f0e14 100755 --- a/xbmc-pvr-addons-generate-tarball-xz.sh +++ b/xbmc-pvr-addons-generate-tarball-xz.sh @@ -5,7 +5,10 @@ set -e # The xbmc-pvr-addon software does not yet use version numbers, so we'll # just use git hashes for identifiers. -GITHASH=e573d80219 +# 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 @@ -1,11 +1,11 @@ -%global PRERELEASE Frodo_rc2 +%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.5.%{PRERELEASE}%{?dist} +Release: 0.6.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -20,7 +20,7 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz Source1: xbmc-generate-tarball-xz.sh # xbmc pvr addons are shipped as a separate git repo. -Source2: xbmc-pvr-addons-e573d80219-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 @@ -325,6 +325,10 @@ fi #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Fri Jan 04 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 |