SPECS: ffmpeg.spec - -devel R: libx264-devel now - added versions ...

[qboosh]

Author: qboosh                       Date: Tue May  9 10:21:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -devel R: libx264-devel now
- added versions to lzo-devel deps (lzo support must be disabled or updated)

---- Files affected:
SPECS:
   ffmpeg.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.94 SPECS/ffmpeg.spec:1.95
--- SPECS/ffmpeg.spec:1.94	Fri May  5 14:34:38 2006
+++ SPECS/ffmpeg.spec	Tue May  9 12:21:03 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # TODO: only lzo 1.x is supported
-#	- make (ffmpeg code inside) mplayer play .3gp mobile phone movies 
+#	- make (ffmpeg code inside) mplayer play .3gp mobile phone movies
 #	  (ffplay and vlc plays them fine
 #
 # Conditional build:
@@ -68,7 +68,7 @@
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel
 BuildRequires:	libx264-devel >= 0.1.2-1.20060430_2245.1
-BuildRequires:	lzo-devel
+BuildRequires:	lzo-devel < 2.0
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires:	nasm
@@ -136,7 +136,8 @@
 Requires:	libgsm-devel
 Requires:	libtheora-devel
 Requires:	libvorbis-devel
-Requires:	lzo-devel
+Requires:	lzo-devel < 2.0
+Requires:	libx264-devel >= 0.1.2-1.20060430_2245.1
 Requires:	xvid-devel >= 1:1.1.0
 Requires:	zlib-devel
 Obsoletes:	libpostproc-devel
@@ -383,6 +384,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2006/05/09 10:21:03  qboosh
+- -devel R: libx264-devel now
+- added versions to lzo-devel deps (lzo support must be disabled or updated)
+
 Revision 1.94  2006/05/05 12:34:38  glen
 - R faad2-devel for -devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.94&r2=1.95&f=u