summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Cronenworth <mike@cchtml.com>2014-05-10 17:49:28 -0500
committerMichael Cronenworth <mike@cchtml.com>2014-05-10 17:49:28 -0500
commitfefeb4ade984814f3588e674e5a9bb6b6d45ef81 (patch)
treecd5589e13b5830152c4ea92fdf804c12f9531650
parent18d7d5256b223c42c8137299e2dc5247bc5f3086 (diff)
downloadxbmc-rpm-fefeb4ade984814f3588e674e5a9bb6b6d45ef81.tar.gz
xbmc-rpm-fefeb4ade984814f3588e674e5a9bb6b6d45ef81.tar.xz
xbmc-rpm-fefeb4ade984814f3588e674e5a9bb6b6d45ef81.zip
Update to latest Gotham final branch for rtmp fixes
-rwxr-xr-xxbmc-generate-tarball-xz.sh9
-rw-r--r--xbmc.spec11
2 files changed, 14 insertions, 6 deletions
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 00324bd..0dd6bf3 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,12 +2,15 @@
MAJORVERSION=13
MINORVERSION=0
-#PRERELEASE=Gotham_rc1
+GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
+GITSHORT=ge988513
+PRERELEASE=Gotham_r2
-VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
+VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}${GITSHORT:+-${GITSHORT}}
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham
#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT
# download zipball
if [[ ! -f xbmc-$VERSION.zip ]]; then
diff --git a/xbmc.spec b/xbmc.spec
index c78676e..0538537 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,18 +1,19 @@
#global PRERELEASE Gotham_rc1
%global DIRVERSION %{version}
+%global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
#global DIRVERSION %{version}-%{PRERELEASE}
%global _hardened_build 1
Name: xbmc
Version: 13.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+
Group: Applications/Multimedia
URL: http://www.xbmc.org/
-Source0: %{name}-%{DIRVERSION}-patched.tar.xz
+Source0: %{name}-%{DIRVERSION}-%{GITCOMMIT}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
@@ -233,7 +234,7 @@ library.
%prep
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -n %{name}-%{DIRVERSION}-%{GITCOMMIT}
%patch1 -p1
%patch2 -p1
@@ -383,6 +384,10 @@ fi
%changelog
+* Sat May 10 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-2
+- Update to latest Gotham final branch (commit e988513)
+- Fixes for rtmp (RFBZ #3234)
+
* Sun May 04 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-1
- Update to Gotham final