rpms/vlc/F-10 .cvsignore, 1.9, 1.10 sources, 1.12, 1.13 vlc.spec, 1.27, 1.28

[NicolasChauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13782

Modified Files:
	.cvsignore sources vlc.spec 
Log Message:
Update to 1.0.3
ReSync for F-10



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Sep 2009 19:22:33 -0000	1.9
+++ .cvsignore	31 Oct 2009 09:36:39 -0000	1.10
@@ -1 +1 @@
-vlc-1.0.2.tar.bz2
+vlc-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Sep 2009 15:43:16 -0000	1.12
+++ sources	31 Oct 2009 09:36:39 -0000	1.13
@@ -1 +1 @@
-69d4e30fe4fc2691780fbeacd40359d2  vlc-1.0.2.tar.bz2
+d0945c2489551c102a3f0f15e4591555  vlc-1.0.3.tar.bz2


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/vlc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vlc.spec	29 Sep 2009 20:25:08 -0000	1.27
+++ vlc.spec	31 Oct 2009 09:36:39 -0000	1.28
@@ -1,14 +1,14 @@
 # TODO: libdc1394(juju), modularization (vlc-plugin-foo)
 
 #global live555_date       2009.07.28
-#global vlc_rc             -rc4
+#global vlc_rc             -rc
 %global vlc_bootstrap      1
 
 
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
-Version:	1.0.2
-Release:	1%{?dist}.2
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -41,7 +41,7 @@
 BuildRequires:  dbus-devel
 BuildRequires:  dirac-devel >= 1.0.0
 %{!?_without_directfb:BuildRequires:  directfb-devel}
-BuildRequires:	faac-devel
+%{?_with_faac:BuildRequires:  faac-devel}
 BuildRequires:	faad2-devel
 BuildRequires:	ffmpeg-devel >= 0.4.9-0
 BuildRequires:	flac-devel
@@ -95,6 +95,7 @@
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:  libmusicbrainz-devel
+BuildRequires:  libshout-devel
 BuildRequires:  lua-devel
 BuildRequires:  minizip-devel
 BuildRequires:	mpeg2dec-devel >= 0.3.2
@@ -143,6 +144,7 @@
 
 %if 0%{?fedora} > 10
 Requires: dejavu-sans-fonts
+Requires: dejavu-serif-fonts
 %else
 Requires: dejavu-fonts
 %endif
@@ -215,16 +217,6 @@
 JACK audio plugin for the VLC media player.
 
 
-%{?_with_dc1394:
-%package plugin-dc1394
-Summary:	VLC Media Player Plugins for dc1394
-Group:		Applications/Multimedia
-Requires:	%{name}-core%{_isa} = %{version}
-
-%description plugin-dc1394
-VLC plugin for libdc1394
-}
-
 %prep
 %setup -q -n %{name}-%{version}%{?vlc_rc}
 %if 0%{?live555_date:1}
@@ -241,7 +233,7 @@
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
 %if 0%{?vlc_bootstrap:1}
-rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
 ./bootstrap
 %endif
 
@@ -262,7 +254,7 @@
 %configure \
 	--disable-dependency-tracking		\
 	--disable-rpath				\
-	--enable-debug			\
+	--enable-release			\
 	--with-binary-version=%{version}-%{release} \
 	--with-tuning=no			\
 	--enable-switcher			\
@@ -271,7 +263,6 @@
 %if 0%{?live555_date:1}
 	--with-live555-tree=live		\
 %endif
-%{?_with_dc1394:--enable-dc1394}		\
 	--enable-dv				\
 	--enable-opencv				\
 	--enable-pvr				\
@@ -281,6 +272,7 @@
 %{!?_with_x264:--disable-x264}			\
 	--enable-shine				\
 	--enable-faad				\
+%{!?_with_faac:--disable-faac}			\
 	--enable-twolame			\
 	--enable-real				\
 	--enable-realrtsp			\
@@ -291,6 +283,7 @@
 	--enable-theora				\
 	--enable-dirac				\
 	--enable-libass				\
+	--enable-shout				\
 	--enable-xcb				\
 	--enable-svg				\
 	--enable-snapshot			\
@@ -500,9 +493,6 @@
 %exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
 %exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
 %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
-%{?_with_dc1394:
-%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
-}
 %{_libdir}/vlc/
 %{_mandir}/man1/vlc*.1*
 
@@ -522,12 +512,6 @@
 %{_libdir}/vlc/video_output/libsvgalib_plugin.so
 %endif
 
-%{?_with_dc1394:
-%files plugin-dc1394
-%defattr(-,root,root,-)
-%{_libdir}/vlc/access/libdc1394_plugin.so
-}
-
 %files devel
 %defattr(-,root,root,-)
 %doc HACKING
@@ -547,11 +531,24 @@
 
 
 %changelog
+* Sat Oct 31 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3
+- Resync for F-10
+
+* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3-0.1_rc
+- Update to 1.0.3-rc
+- Update bugfix to 20091025
+- Clean dc1394 sub-package
+
+* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
+- Update to 1.0-bugfix 20091016
+- Rebuild for x264/ffmpeg
+
 * Sun Sep 27 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.2
 - x264 disabled because version isn't new enought (re-enabled --with x264)
 
-* Wed Sep 23 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1
-- Rsync for F-10
+* 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.
 
 * Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
 - Update to 1.0.2