rpms/vlc/EL-6 0003-Fix-the-ca-cert-path-in-fedora.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 sources, 1.60, 1.61 vlc.spec, 1.162, 1.163

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27094/EL-6

Modified Files:
	.cvsignore sources vlc.spec 
Added Files:
	0003-Fix-the-ca-cert-path-in-fedora.patch 
Log Message:
Update to 2.0.10


0003-Fix-the-ca-cert-path-in-fedora.patch:
 gnutls.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0003-Fix-the-ca-cert-path-in-fedora.patch ---
>From 08c6d8f3cbc5b2bd845b5e6ed8a5d15978ca6186 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Wed, 6 Nov 2013 23:48:48 +0100
Subject: [PATCH 3/3] Fix the ca cert path in fedora

---
 modules/misc/gnutls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index b0129ad..9070e3d 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -580,8 +580,8 @@ static int OpenClient (vlc_tls_t *session, int fd, const char *hostname)
     const char *confdir = config_GetConfDir ();
     {
         char path[strlen (confdir)
-                   + sizeof ("/ssl/certs/ca-certificates.crt")];
-        sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+                   + sizeof ("/ssl/certs/ca-bundle.trust.crt")];
+        sprintf (path, "%s/ssl/certs/ca-bundle.trust.crt", confdir);
         gnutls_Addx509File (VLC_OBJECT(session), sys->x509_cred, path, false);
     }
 #else /* WIN32 */
-- 
1.8.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	30 Jul 2013 18:30:43 -0000	1.52
+++ .cvsignore	21 Feb 2014 20:32:47 -0000	1.53
@@ -1 +1 @@
-vlc-2.0.8.tar.xz
+vlc-2.0.10.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	30 Jul 2013 18:30:44 -0000	1.60
+++ sources	21 Feb 2014 20:32:48 -0000	1.61
@@ -1 +1 @@
-6445eb55aa087f30abe27423535e1ab8  vlc-2.0.8.tar.xz
+2fe96f0d85b7075a0ca1a733c6d8027e  vlc-2.0.10.tar.xz


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/vlc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- vlc.spec	2 Aug 2013 10:14:51 -0000	1.162
+++ vlc.spec	21 Feb 2014 20:32:48 -0000	1.163
@@ -30,15 +30,15 @@
 
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
-Version:	2.0.8
-Release:	2%{?dist}
+Version:	2.0.10
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
 Patch0:         vlc-2.0.2-xcb_discard.patch
 Patch2:         0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
-Patch3:         vlc-backport-audio_decoder.patch
+Patch3:		0003-Fix-the-ca-cert-path-in-fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -83,6 +83,7 @@
 %{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel}
 BuildRequires:	libdvdnav-devel
 BuildRequires:	libebml-devel
+BuildRequires:	libgcrypt-devel
 BuildRequires:	libid3tag-devel
 BuildRequires:	libkate-devel
 %{?_with_libmad:BuildRequires: libmad-devel}
@@ -232,7 +233,7 @@
 }
 %endif
 %patch2 -p1 -b .samba4
-%patch3 -p1 -b .backport
+%patch3 -p1 -b .tls
 
 %{?_with_bootstrap:
 rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -458,6 +459,9 @@
 %exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
 %exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
 }
+%{?_with_crystalhd:
+%exclude %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
 %{?_with_fluidsynth:
 %exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
 }
@@ -514,6 +518,9 @@
 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
 %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
 }
+%{?_with_crystalhd:
+%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
 
 %files devel
 %defattr(-,root,root,-)
@@ -526,6 +533,16 @@
 
 
 %changelog
+* Fri Feb 21 2014 Nicolas Chauvet <kwizart at gmail.com> - 2.0.10-1
+- Update to 2.0.10
+
+* Wed Nov 06 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.9-1
+- Update to 2.0.9
+- Move crystalhd to extras - rhbz#2835
+  Patch from Sergio Durigan Junior <sergiodj at riseup.net>
+- Fix ca cert path on fedora
+- Add missing libgcrypt-devel
+
 * Fri Aug 02 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.8-2
 - Backport patch from 2.0.8a