Author: mooninite
Update of /cvs/free/rpms/xbmc/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15721
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
* Sat May 10 2014 Michael Cronenworth <mike(a)cchtml.com> - 13.0-2
- Update to latest Gotham final branch (commit e988513)
- Fixes for rtmp (RFBZ #3234)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 5 May 2014 00:01:44 -0000 1.27
+++ .cvsignore 10 May 2014 23:02:48 -0000 1.28
@@ -1 +1 @@
-xbmc-13.0-patched.tar.xz
+xbmc-13.0-Gotham_r2-ge988513-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 5 May 2014 00:01:44 -0000 1.29
+++ sources 10 May 2014 23:02:49 -0000 1.30
@@ -1 +1 @@
-3e4b9596b6b9572600a798d3c4b522aa xbmc-13.0-patched.tar.xz
+90f50ccc6923d4dbe7dc726cfcef5416 xbmc-13.0-Gotham_r2-ge988513-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xbmc-generate-tarball-xz.sh 5 May 2014 00:01:44 -0000 1.27
+++ xbmc-generate-tarball-xz.sh 10 May 2014 23:02:49 -0000 1.28
@@ -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
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-20/xbmc.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xbmc.spec 5 May 2014 00:01:44 -0000 1.74
+++ xbmc.spec 10 May 2014 23:02:49 -0000 1.75
@@ -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 @@
%prep
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -n %{name}-%{DIRVERSION}-%{GITCOMMIT}
%patch1 -p1
%patch2 -p1
@@ -383,6 +384,10 @@
%changelog
+* Sat May 10 2014 Michael Cronenworth <mike(a)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(a)cchtml.com> - 13.0-1
- Update to Gotham final