rpms/qmmp-plugins-freeworld/F-8 qmmp-plugins-freeworld.spec, 1.2, 1.3

[Karel Volný]

Author: kvolny

Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5587

Modified Files:
	qmmp-plugins-freeworld.spec 
Log Message:
oops, the new ffmpeg is not in this branch, reverting previous change




Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-8/qmmp-plugins-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qmmp-plugins-freeworld.spec	19 Aug 2008 15:57:04 -0000	1.2
+++ qmmp-plugins-freeworld.spec	20 Aug 2008 15:09:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		qmmp-plugins-freeworld
 Version:	0.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Plugins for qmmp (Qt-based multimedia player)
 
 Group:		Applications/Multimedia
@@ -13,7 +13,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	cmake ffmpeg-devel >= 0.4.9-0.8 libmad-devel qt4-devel >= 4.2
+BuildRequires:	cmake ffmpeg-devel < 0.4.9-0.8 libmad-devel qt4-devel >= 4.2
 BuildRequires:	taglib-devel curl-devel
 BuildRequires:	qmmp = %{version}
 Requires:	qmmp = %{version}
@@ -28,14 +28,6 @@
 %setup -q -n qmmp-%{version}
 cp %{SOURCE2} .
 chmod +x qmmp-filter-provides.sh
-# adjust includes for the header move in latest ffmpeg
-sed -i \
-	-e 's|<avcodec.h|<libavcodec/avcodec.h|g' \
-	-e 's|g/avcodec.h|g/libavcodec/avcodec.h|g' \
-	-e 's|<avformat.h|<libavformat/avformat.h|g' \
-	-e 's|g/avformat.h|g/libavformat/avformat.h|g' \
-	src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
-	src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
 
 
 %build
@@ -86,9 +78,12 @@
 
 
 %changelog
+* Wed Aug 20 2008 Karel Volny <kvolny at redhat.com> 0.2.0-6
+- reverted previous change, the new ffmpeg is not released in this branch
+
 * Tue Aug 19 2008 Karel Volny <kvolny at redhat.com> 0.2.0-5
 - adjusted includes for the header move in latest ffmpeg
-- upgrade ffmpeg-devel dependency
+- upgraded ffmpeg-devel dependency
 
 * Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.2.0-4
 - rebuild for RPM Fusion