rpms/xbmc/F-18 .cvsignore, 1.16, 1.17 sources, 1.19, 1.20 xbmc-generate-tarball-xz.sh, 1.17, 1.18 xbmc-pvr-addons-generate-tarball-xz.sh, 1.2, 1.3 xbmc.spec, 1.56, 1.57

[Ken Dreyer]

Author: ktdreyer

Update of /cvs/free/rpms/xbmc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23081

Modified Files:
	.cvsignore sources xbmc-generate-tarball-xz.sh 
	xbmc-pvr-addons-generate-tarball-xz.sh xbmc.spec 
Log Message:
* Tue Feb 05 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-1
- Update to Frodo final
- Add libcec dependency



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Jan 2013 01:57:47 -0000	1.16
+++ .cvsignore	6 Feb 2013 01:42:18 -0000	1.17
@@ -1,2 +1,2 @@
-xbmc-12.0-Frodo_rc3-patched.tar.xz
-xbmc-pvr-addons-5f97406cff-patched.tar.xz
+xbmc-12.0-patched.tar.xz
+xbmc-pvr-addons-96774c4-patched.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Jan 2013 01:57:48 -0000	1.19
+++ sources	6 Feb 2013 01:42:20 -0000	1.20
@@ -1,2 +1,2 @@
-c806f10522f411b0ca433739953c17b1  xbmc-12.0-Frodo_rc3-patched.tar.xz
-47a2b90e4bd567540d550c50d7dc372b  xbmc-pvr-addons-5f97406cff-patched.tar.xz
+1c926423413b66d1746a409ce4970d28  xbmc-12.0-patched.tar.xz
+6a5a34c9bb98c1743ac9c7906fbbb2c1  xbmc-pvr-addons-96774c4-patched.tar.xz


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xbmc-generate-tarball-xz.sh	5 Jan 2013 01:57:50 -0000	1.17
+++ xbmc-generate-tarball-xz.sh	6 Feb 2013 01:42:20 -0000	1.18
@@ -2,12 +2,12 @@
 
 MAJORVERSION=12
 MINORVERSION=0
-PRERELEASE=Frodo_rc3
+#PRERELEASE=Frodo_rc3
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
-#GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
 
 # download zipball
 if [[ ! -f xbmc-$VERSION.zip ]]; then


Index: xbmc-pvr-addons-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-pvr-addons-generate-tarball-xz.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-pvr-addons-generate-tarball-xz.sh	5 Jan 2013 01:57:51 -0000	1.2
+++ xbmc-pvr-addons-generate-tarball-xz.sh	6 Feb 2013 01:42:21 -0000	1.3
@@ -7,8 +7,10 @@
 
 # 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
+# can be found in the source tree like so:
+#   grep ^VERSION tools/darwin/depends/xbmc-pvr-addons/Makefile
+COMMIT=96774c4f775b156a46fb58151379dece3e773c96
+GITHASH=${COMMIT:0:7}
 GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip
 
 # download zipball


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xbmc.spec	5 Jan 2013 01:57:51 -0000	1.56
+++ xbmc.spec	6 Feb 2013 01:42:21 -0000	1.57
@@ -1,11 +1,11 @@
-%global PRERELEASE Frodo_rc3
-#global DIRVERSION %{version}
+#global PRERELEASE Frodo_rc3
+%global DIRVERSION %{version}
 # use the line below for pre-releases
-%global DIRVERSION %{version}-%{PRERELEASE}
+#global DIRVERSION %{version}-%{PRERELEASE}
 
 Name: xbmc
 Version: 12.0
-Release: 0.6.%{PRERELEASE}%{?dist}
+Release: 1%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -20,7 +20,7 @@
 Source1: xbmc-generate-tarball-xz.sh
 
 # xbmc pvr addons are shipped as a separate git repo.
-Source2: xbmc-pvr-addons-5f97406cff-patched.tar.xz
+Source2: xbmc-pvr-addons-96774c4-patched.tar.xz
 Source3: xbmc-pvr-addons-generate-tarball-xz.sh
 
 # https://github.com/xbmc/xbmc/pull/1725.patch
@@ -51,6 +51,7 @@
 %{?fedora:%global _with_libbluray 1}
 %{?fedora:%global _with_cwiid     1}
 %{?fedora:%global _with_libssh    1}
+%{?fedora:%global _with_libcec    1}
 
 ExcludeArch: ppc64
 Buildroot: %{_tmppath}/%{name}-%{version}
@@ -161,6 +162,9 @@
 BuildRequires: libssh-devel
 %endif
 BuildRequires: libcap-devel
+%if 0%{?_with_libcec}
+BuildRequires: libcec-devel
+%endif
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
@@ -180,6 +184,9 @@
 %if 0%{?_with_libbluray}
 Requires: libbluray
 %endif
+%if 0%{?_with_libcec}
+Requires: libcec
+%endif
 
 # needed when doing a minimal install, see
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844
@@ -325,6 +332,10 @@
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Tue Feb 05 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-1
+- Update to Frodo final
+- Add libcec dependency
+
 * Fri Jan 04 2013 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.6.Frodo_rc3
 - Update to Frodo RC 3
 - Update PVR addons snapshot to match snapshot bundled in rc3