Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13803
Modified Files:
vlc.spec
Removed Files:
vlc-1.0.2-compiler.patch
Log Message:
- Disable the workaround for the compiler bug. (rhbz#524439)
- Resync with the fonts requirement.:x
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vlc.spec 20 Sep 2009 09:05:52 -0000 1.64
+++ vlc.spec 27 Sep 2009 18:20:30 -0000 1.65
@@ -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 @@
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 @@
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
+Requires: dejavu-serif-fonts
%else
Requires: dejavu-fonts
%endif
@@ -238,13 +238,6 @@
%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 @@
%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.
--- vlc-1.0.2-compiler.patch DELETED ---