rpms/xbmc/devel xbmc-13.1-curl.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 sources, 1.32, 1.33 xbmc-generate-tarball-xz.sh, 1.30, 1.31 xbmc.spec, 1.79, 1.80

[Michael Cronenworth]

Author: mooninite

Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2323

Modified Files:
	.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec 
Added Files:
	xbmc-13.1-curl.patch 
Log Message:
* Mon Jun 09 2014 Michael Cronenworth <mike at cchtml.com> - 13.1-1
- Update to 13.1 final
- Fix default cipher string for Fedora curl (RFBZ #3253)


xbmc-13.1-curl.patch:
 CurlFile.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xbmc-13.1-curl.patch ---
>From b47117d9d0e1be09a298079919cc335baf2f37f0 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <pierre at ossman.eu>
Date: Sun, 25 May 2014 17:10:03 +0200
Subject: [PATCH] curl: don't mess with the default cipher list as we can't
 know the format

---
 xbmc/filesystem/CurlFile.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 30de6f9..0a5ea14 100644
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -394,7 +394,7 @@ CCurlFile::CCurlFile()
   m_username = "";
   m_password = "";
   m_httpauth = "";
-  m_cipherlist = "DEFAULT";
+  m_cipherlist = "";
   m_proxytype = PROXY_HTTP;
   m_state = new CReadState();
   m_oldState = NULL;
@@ -608,7 +608,8 @@ void CCurlFile::SetCommonOptions(CReadState* state)
     g_curlInterface.easy_setopt(h, CURLOPT_IGNORE_CONTENT_LENGTH, 1);
 
   // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use.
-  g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str());
+  if (!m_cipherlist.empty())
+    g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str());
 }
 
 void CCurlFile::SetRequestHeaders(CReadState* state)
-- 
1.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	27 May 2014 04:45:15 -0000	1.30
+++ .cvsignore	9 Jun 2014 13:43:52 -0000	1.31
@@ -1 +1 @@
-xbmc-13.1rc1-patched.tar.xz
+xbmc-13.1-patched.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	27 May 2014 04:45:15 -0000	1.32
+++ sources	9 Jun 2014 13:43:52 -0000	1.33
@@ -1 +1 @@
-ff2b0a3299ff3c0ec7c970a770d524cf  xbmc-13.1rc1-patched.tar.xz
+0edc8652ff71da6beb3219270ef179f9  xbmc-13.1-patched.tar.xz


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xbmc-generate-tarball-xz.sh	27 May 2014 04:45:15 -0000	1.30
+++ xbmc-generate-tarball-xz.sh	9 Jun 2014 13:43:52 -0000	1.31
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAJORVERSION=13
-MINORVERSION=1rc1
+MINORVERSION=1
 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
 #GITSHORT=ge988513
 #PRERELEASE=Gotham


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xbmc.spec	27 May 2014 04:45:15 -0000	1.79
+++ xbmc.spec	9 Jun 2014 13:43:52 -0000	1.80
@@ -1,13 +1,13 @@
-%global PRERELEASE rc1
-#global DIRVERSION %{version}
+#global PRERELEASE rc1
+%global DIRVERSION %{version}
 #global GITCOMMIT Gotham_r2-ge988513
 # use the line below for pre-releases
-%global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}%{PRERELEASE}
 %global _hardened_build 1
 
 Name: xbmc
 Version: 13.1
-Release: 0.2.rc1%{?dist}
+Release: 1%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+
@@ -40,6 +40,10 @@
 # https://github.com/xbmc/xbmc/pull/4696
 Patch5: xbmc-13.0-dbus-power.patch
 
+# Fix default cipher string
+# https://github.com/xbmc/xbmc/pull/4794
+Patch6: xbmc-13.1-curl.patch
+
 # External ffmpeg patches
 Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch
 Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch
@@ -87,6 +91,7 @@
 BuildRequires: flac-devel
 BuildRequires: flex
 BuildRequires: fontconfig-devel
+BuildRequires: fontpackages-devel
 BuildRequires: freetype-devel
 BuildRequires: fribidi-devel
 %if 0%{?el6}
@@ -149,7 +154,7 @@
 BuildRequires: libvdpau-devel
 %endif
 BuildRequires: libvorbis-devel
-BuildRequires: libxml-devel
+BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: lzo-devel
 BuildRequires: mariadb-devel
@@ -177,6 +182,7 @@
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
 
+Requires: google-roboto-fonts
 # need explicit requires for these packages
 # as they are dynamically loaded via XBMC's arcane 
 # pseudo-DLL loading scheme (sigh)
@@ -245,6 +251,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -340,6 +347,10 @@
 #install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
 #ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
 
+# Use external Roboto font files instead of bundled ones
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/
+
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -389,6 +400,13 @@
 
 
 %changelog
+* Mon Jun 09 2014 Michael Cronenworth <mike at cchtml.com> - 13.1-1
+- Update to 13.1 final
+- Fix default cipher string for Fedora curl (RFBZ #3253)
+
+* Thu May 29 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 13.1-0.3.rc1
+- Unbundle Roboto fonts (RFBZ #3256). Thanks Mohamed El Morabity.
+
 * Mon May 26 2014 Michael Cronenworth <mike at cchtml.com> - 13.1-0.2.rc1
 - Update to 13.1 RC 1