diff --git a/vlc-1.0.2-compiler.patch b/vlc-1.0.2-compiler.patch deleted file mode 100644 index d374dba..0000000 --- a/vlc-1.0.2-compiler.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up vlc-1.0.2/modules/access/bd/Modules.am.compiler vlc-1.0.2/modules/access/bd/Modules.am ---- vlc-1.0.2/modules/access/bd/Modules.am.compiler 2009-09-18 00:23:37.000000000 +0200 -+++ vlc-1.0.2/modules/access/bd/Modules.am 2009-09-20 10:35:40.107945580 +0200 -@@ -8,3 +8,5 @@ SOURCES_access_bd = \ - - libvlc_LTLIBRARIES += libaccess_bd_plugin.la - -+libaccess_bd_plugin_la_CFLAGS = -O0 -+ diff --git a/vlc.spec b/vlc.spec index f3c96b9..dea9279 100644 --- a/vlc.spec +++ b/vlc.spec @@ -8,7 +8,7 @@ Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc Version: 1.0.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -22,7 +22,6 @@ Patch1: 0001-Default-libv4l2-to-true.patch Patch2: 0002-Default-aout-for-pulse.patch Patch3: 300_all_pic.patch Patch4: 310_all_mmx_pic.patch -Patch5: vlc-1.0.2-compiler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -144,6 +143,7 @@ Requires: vlc-core%{_isa} = %{version}-%{release} %if 0%{?fedora} > 10 Requires: dejavu-sans-fonts +Requires: dejavu-serif-fonts %else Requires: dejavu-fonts %endif @@ -238,13 +238,6 @@ VLC plugin for libdc1394 %patch3 -p1 -b .dmo_pic sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch4 -p1 -b .mmx_pic -%ifarch %{ix86} x86_64 -#https://bugzilla.redhat.com/show_bug.cgi?id=524439 -%patch5 -p1 -b .compiler -%endif - -#Workaround internal compiler bug in bd.c -sed -i -e 's/screen bd zip/screen zip/' modules/access/Modules.am rm modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h @@ -554,6 +547,10 @@ fi || : %changelog +* Sun Sep 27 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.2 +- Disable the workaround for the compiler bug. (rhbz#524439) +- Resync with the fonts requirement. + * Sun Sep 20 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1 - Workaround the compiler bug on x86 x86_64 by disabling optimization.