10:31 p.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31902/F-14
Modified Files:
vlc.spec
Added Files:
vlc-1.1.4-hardode_font_patch.patch vlc-1.1.4-tls_path.patch
Log Message:
Refix
vlc-1.1.4-hardode_font_patch.patch:
projectm.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vlc-1.1.4-hardode_font_patch.patch ---
diff -up vlc-1.1.4/modules/visualization/projectm.cpp.hardcode
vlc-1.1.4/modules/visualization/projectm.cpp
--- vlc-1.1.4/modules/visualization/projectm.cpp.hardcode 2010-04-13 02:22:27.000000000
+0200
+++ vlc-1.1.4/modules/visualization/projectm.cpp 2010-11-10 22:52:59.496688406 +0100
@@ -75,9 +75,9 @@ vlc_module_begin ()
#else
add_file( "projectm-preset-path", "/usr/share/projectM/presets",
NULL,
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
- add_file( "projectm-title-font",
"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL,
+ add_file( "projectm-title-font",
"/usr/share/fonts/dejavu/DejaVuSans.ttf", NULL,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
- add_file( "projectm-menu-font",
"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL,
+ add_file( "projectm-menu-font",
"/usr/share/fonts/dejavu/DejaVuSansMono.ttf", NULL,
MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
#endif
add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT,
vlc-1.1.4-tls_path.patch:
gnutls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vlc-1.1.4-tls_path.patch ---
diff -up vlc-1.1.4/modules/misc/gnutls.c.tls_path vlc-1.1.4/modules/misc/gnutls.c
--- vlc-1.1.4/modules/misc/gnutls.c.tls_path 2010-06-08 00:57:45.000000000 +0200
+++ vlc-1.1.4/modules/misc/gnutls.c 2010-11-10 23:13:01.390977175 +0100
@@ -695,8 +695,8 @@ static int OpenClient (vlc_object_t *obj
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 ("/pki/tls/certs/ca-bundle.crt")];
+ sprintf (path, "%s/pki/tls/certs/ca-bundle.crt", confdir);
gnutls_Addx509File (VLC_OBJECT (p_session),
p_sys->x509_cred, path, false);
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- vlc.spec 10 Nov 2010 22:19:32 -0000 1.97
+++ vlc.spec 10 Nov 2010 22:30:55 -0000 1.98
@@ -83,7 +83,7 @@
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmtp-devel >= 1.0.0
-%if 0%{?fedora} < 15 || 0%{?rhel} =< 6
+%if 0%{?fedora} < 15
BuildRequires: libnotify-devel
%endif
BuildRequires: libprojectM-qt-devel
@@ -267,7 +267,7 @@
--disable-rpath \
--with-binary-version=%{version} \
--with-tuning=no \
-%if 0%{?fedora} < 15 || 0%{?rhel} =< 6
+%if 0%{?fedora} < 15
--disable-notify \
%endif
--with-kde-solid=%{_kde4_appsdir}/solid/actions \
@@ -438,7 +438,7 @@
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%{_libdir}/vlc/plugins/misc/libsvg_plugin.so
-%if 0%{?fedora} < 15 || 0%{?rhel} =< 6
+%if 0%{?fedora} < 15
%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
%endif
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
@@ -474,7 +474,7 @@
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
%exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%exclude %{_libdir}/vlc/plugins/misc/libsvg_plugin.so
-%if 0%{?fedora} < 15 || 0%{?rhel} =< 6
+%if 0%{?fedora} < 15
%exclude %{_libdir}/vlc/plugins/misc/libnotify_plugin.so
%endif
%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so