summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2012-12-26 19:07:00 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2012-12-26 19:07:56 -0700
commit5b663d5e8c0430ec3de4d71cfa6b2dcadb472323 (patch)
treeee329becf9273d54e69d7ac3ee94b7e9444a092a
parentc1e0c0508bc7f77477afe9a441d81293d37e2df0 (diff)
downloadxbmc-rpm-5b663d5e8c0430ec3de4d71cfa6b2dcadb472323.tar.gz
xbmc-rpm-5b663d5e8c0430ec3de4d71cfa6b2dcadb472323.tar.xz
xbmc-rpm-5b663d5e8c0430ec3de4d71cfa6b2dcadb472323.zip
Update to Frodo RC 2 and use newer PVR addons snapshot
- Update to Frodo RC 2 - Update PVR addons snapshot to the latest Git version
-rw-r--r--.gitignore4
-rwxr-xr-xxbmc-generate-tarball-xz.sh2
-rwxr-xr-xxbmc-pvr-addons-generate-tarball-xz.sh2
-rw-r--r--xbmc.spec8
4 files changed, 10 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index dd21463..2fa8dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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-1e666ced21-patched.tar.xz
+/xbmc-pvr-addons-e573d80219-patched.tar.xz
/xbmc-12.0-Frodo_beta2-patched.tar.xz
-/xbmc-12.0-Frodo_rc1-patched.tar.xz
+/xbmc-12.0-Frodo_rc2-patched.tar.xz
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index cc6c3d3..8be9cd2 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
MAJORVERSION=12
MINORVERSION=0
-PRERELEASE=Frodo_rc1
+PRERELEASE=Frodo_rc2
VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
diff --git a/xbmc-pvr-addons-generate-tarball-xz.sh b/xbmc-pvr-addons-generate-tarball-xz.sh
index e0309f0..2965036 100755
--- a/xbmc-pvr-addons-generate-tarball-xz.sh
+++ b/xbmc-pvr-addons-generate-tarball-xz.sh
@@ -5,7 +5,7 @@ set -e
# The xbmc-pvr-addon software does not yet use version numbers, so we'll
# just use git hashes for identifiers.
-GITHASH=1e666ced21
+GITHASH=e573d80219
GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip
# download zipball
diff --git a/xbmc.spec b/xbmc.spec
index 5f4db4c..1bc9941 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Frodo_rc1
+%global PRERELEASE Frodo_rc2
#global DIRVERSION %{version}
# use the line below for pre-releases
%global DIRVERSION %{version}-%{PRERELEASE}
@@ -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-1e666ced21-patched.tar.xz
+Source2: xbmc-pvr-addons-e573d80219-patched.tar.xz
Source3: xbmc-pvr-addons-generate-tarball-xz.sh
# https://github.com/xbmc/xbmc/pull/1725.patch
@@ -342,6 +342,10 @@ fi
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Wed Dec 27 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 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@ktdreyer.com> - 12.0-0.4.Frodo_rc1
- Disable crystalhd on non-x86 (by kwizart)
- Enable VAAPI: add BR: libva-devel (#2613)