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
by 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(a)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(a)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(a)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(a)ktdreyer.com> - 13.1-0.3.rc1
+- Unbundle Roboto fonts (RFBZ #3256). Thanks Mohamed El Morabity.
+
* Mon May 26 2014 Michael Cronenworth <mike(a)cchtml.com> - 13.1-0.2.rc1
- Update to 13.1 RC 1
9 years, 10 months
rpms/wl-kmod/F-19 wl-kmod.spec,1.123,1.124
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6494
Modified Files:
wl-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.32
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- wl-kmod.spec 3 Jun 2014 09:40:07 -0000 1.123
+++ wl-kmod.spec 8 Jun 2014 12:34:32 -0000 1.124
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 1%{?dist}.31
+Release: 1%{?dist}.32
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.32
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.31
- Rebuilt for kernel
9 years, 10 months
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.186,1.187
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6362
Modified Files:
nvidia-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.5
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- nvidia-kmod.spec 3 Jun 2014 09:39:56 -0000 1.186
+++ nvidia-kmod.spec 8 Jun 2014 12:34:11 -0000 1.187
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.67
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -97,6 +97,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.5
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.4
- Rebuilt for kernel
9 years, 10 months
rpms/nvidia-304xx-kmod/F-19 nvidia-304xx-kmod.spec,1.54,1.55
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6210
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.121-1.2
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia-304xx-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- nvidia-304xx-kmod.spec 3 Jun 2014 09:39:51 -0000 1.54
+++ nvidia-304xx-kmod.spec 8 Jun 2014 12:33:33 -0000 1.55
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.121
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -79,6 +79,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.121-1.2
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.121-1.1
- Rebuilt for kernel
9 years, 10 months
rpms/nvidia-173xx-kmod/F-19 nvidia-173xx-kmod.spec,1.99,1.100
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6083
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-3.2
- Rebuilt for kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19/nvidia-173xx-kmod.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- nvidia-173xx-kmod.spec 3 Jun 2014 09:39:44 -0000 1.99
+++ nvidia-173xx-kmod.spec 8 Jun 2014 12:33:12 -0000 1.100
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.38
# Taken over by kmodtool
-Release: 3%{?dist}.1
+Release: 3%{?dist}.2
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-3.2
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-3.1
- Rebuilt for kernel
9 years, 10 months
rpms/catalyst-kmod/F-19 catalyst-kmod.spec,1.74,1.75
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/catalyst-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5898
Modified Files:
catalyst-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.3
- Rebuilt for kernel
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- catalyst-kmod.spec 3 Jun 2014 09:39:38 -0000 1.74
+++ catalyst-kmod.spec 8 Jun 2014 12:32:55 -0000 1.75
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 14.4
-Release: 1%{?dist}.2
+Release: 1%{?dist}.3
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -100,6 +100,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.3
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.2
- Rebuilt for kernel
9 years, 10 months
rpms/xtables-addons-kmod/F-19 xtables-addons-kmod.spec,1.78,1.79
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5757
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-3.43
- Rebuilt for kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-19/xtables-addons-kmod.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xtables-addons-kmod.spec 3 Jun 2014 09:39:33 -0000 1.78
+++ xtables-addons-kmod.spec 8 Jun 2014 12:32:38 -0000 1.79
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 2.3
-Release: 3%{?dist}.42
+Release: 3%{?dist}.43
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-3.43
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-3.42
- Rebuilt for kernel
9 years, 10 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.74,1.75
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5588
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.10-1.5
- Rebuilt for kernel
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- VirtualBox-kmod.spec 3 Jun 2014 09:39:28 -0000 1.74
+++ VirtualBox-kmod.spec 8 Jun 2014 12:32:20 -0000 1.75
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.10
-Release: 1%{?prerel:.%{prerel}}%{?dist}.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}.5
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.10-1.5
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.10-1.4
- Rebuilt for kernel
9 years, 10 months
rpms/staging-kmod/F-19 staging-kmod.spec,1.78,1.79
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5400
Modified Files:
staging-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.13.3-1.14
- Rebuilt for kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-19/staging-kmod.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- staging-kmod.spec 3 Jun 2014 09:39:22 -0000 1.78
+++ staging-kmod.spec 8 Jun 2014 12:31:59 -0000 1.79
@@ -25,7 +25,7 @@
Name: staging-kmod
Version: 3.13.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.13
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.14
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -149,6 +149,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.13.3-1.14
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.13.3-1.13
- Rebuilt for kernel
9 years, 10 months
rpms/openafs-kmod/F-19 openafs-kmod.spec,1.84,1.85
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5248
Modified Files:
openafs-kmod.spec
Log Message:
* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.23
- Rebuilt for kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/openafs-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- openafs-kmod.spec 3 Jun 2014 09:39:17 -0000 1.84
+++ openafs-kmod.spec 8 Jun 2014 12:31:41 -0000 1.85
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.6
-Release: 0.%{pre}%{?dist}.22
+Release: 0.%{pre}%{?dist}.23
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.23
+- Rebuilt for kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.22
- Rebuilt for kernel
9 years, 10 months