rpms/vlc/devel sources, 1.20, 1.21 .cvsignore, 1.20, 1.21 vlc.spec, 1.56, 1.57

[NicolasChauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11792

Modified Files:
	sources .cvsignore vlc.spec 
Log Message:
- Conditionalize libass until stabilized ABI.
- Update to 1.0-bugfix 20090812



Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	28 Jul 2009 11:02:28 -0000	1.20
+++ sources	12 Aug 2009 08:59:56 -0000	1.21
@@ -1 +1,2 @@
 6e299d373e7751bb36de001cdc6a2989  vlc-1.0.1.tar.bz2
+2df9319d666071efd2a5b9f4a04e3a07  vlc-1.0-bugfix-20090812.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Jul 2009 11:02:28 -0000	1.20
+++ .cvsignore	12 Aug 2009 08:59:56 -0000	1.21
@@ -1 +1,2 @@
 vlc-1.0.1.tar.bz2
+vlc-1.0-bugfix-20090812.tar.bz2


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vlc.spec	28 Jul 2009 15:41:21 -0000	1.56
+++ vlc.spec	12 Aug 2009 08:59:56 -0000	1.57
@@ -8,7 +8,7 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -22,7 +22,7 @@
 Patch2:         0002-Default-aout-for-pulse.patch
 Patch3:         300_all_pic.patch
 Patch4:         310_all_mmx_pic.patch
-Patch5:         vlc-1.0-bugfix-bp_zip_qt4.patch
+Patch5:         vlc-1.0-bugfix-20090812.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -54,7 +54,7 @@
 BuildRequires:	hal-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:  libavc1394-devel
-BuildRequires:	libass-devel
+%{?_with_libass:BuildRequires:	libass-devel >= 0.9.7}
 BuildRequires:	libcaca-devel
 BuildRequires:	libcddb-devel
 BuildRequires:	libcdio-devel >= 0.77-3
@@ -238,7 +238,7 @@
 %patch3 -p1 -b .dmo_pic
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 %patch4 -p1 -b .mmx_pic
-%patch5 -p1 -b .bp5
+%patch5 -p1 -b .bf
 
 
 rm modules/access/videodev2.h
@@ -292,7 +292,7 @@
 	--enable-tarkin				\
 	--enable-theora				\
 	--enable-dirac				\
-	--enable-libass				\
+%{?_with_libass:--enable-libass}		\
 	--enable-xcb				\
 	--enable-svg				\
 	--enable-snapshot			\
@@ -549,6 +549,10 @@
 
 
 %changelog
+* Wed Aug 12 2009 kwizart < kwizart at gmail.com > - 1.0.1-2
+- Conditionalize libass until stabilized ABI.
+- Update to 1.0-bugfix 20090812
+
 * Tue Jul 28 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
 - Update to 1.0.1 (Final)
 - Improve conditionals