summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2013-04-24 18:23:10 -0600
committerKen Dreyer <ktdreyer@ktdreyer.com>2013-04-24 18:23:10 -0600
commit6f586923e9525e8592af753810a87e1bbe52ef02 (patch)
tree05fccab69b0113bd533bf4891aacefce76f9991e
parentf2783f0697b5b590fa8ed5156465c4c9df85a8d6 (diff)
downloadxbmc-rpm-6f586923e9525e8592af753810a87e1bbe52ef02.tar.gz
xbmc-rpm-6f586923e9525e8592af753810a87e1bbe52ef02.tar.xz
xbmc-rpm-6f586923e9525e8592af753810a87e1bbe52ef02.zip
Update to Frodo 12.1
- Update to Frodo 12.1 - Update PVR addons snapshot to match snapshot bundled in 12.1
-rw-r--r--.gitignore5
-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, 7 deletions
diff --git a/.gitignore b/.gitignore
index e26ea99..0a52f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,5 @@
/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-96774c4-patched.tar.xz
-/xbmc-12.0-Frodo_beta2-patched.tar.xz
-/xbmc-12.0-patched.tar.xz
+/xbmc-pvr-addons-590f862-patched.tar.xz
+/xbmc-12.1-patched.tar.xz
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 7273d96..7b18f89 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=12
-MINORVERSION=0
+MINORVERSION=1
#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 12d881c..568659a 100755
--- a/xbmc-pvr-addons-generate-tarball-xz.sh
+++ b/xbmc-pvr-addons-generate-tarball-xz.sh
@@ -9,7 +9,7 @@ set -e
# xbmc-pvr-addons. Let's try using the same hash that upstream uses. It
# can be found in the source tree like so:
# grep ^VERSION tools/darwin/depends/xbmc-pvr-addons/Makefile
-COMMIT=96774c4f775b156a46fb58151379dece3e773c96
+COMMIT=590f862065d0f07d399fe4443a72dc37394becb4
GITHASH=${COMMIT:0:7}
GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip
diff --git a/xbmc.spec b/xbmc.spec
index 04e7c6e..86fb043 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -4,7 +4,7 @@
#global DIRVERSION %{version}-%{PRERELEASE}
Name: xbmc
-Version: 12.0
+Version: 12.1
Release: 1%{?dist}
URL: http://www.xbmc.org/
@@ -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-96774c4-patched.tar.xz
+Source2: xbmc-pvr-addons-590f862-patched.tar.xz
Source3: xbmc-pvr-addons-generate-tarball-xz.sh
# https://github.com/xbmc/xbmc/pull/1725.patch
@@ -332,6 +332,10 @@ fi
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Wed Apr 24 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.1-1
+- Update to Frodo 12.1
+- Update PVR addons snapshot to match snapshot bundled in 12.1
+
* Tue Feb 05 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-1
- Update to Frodo final
- Add libcec dependency