packages (FFMPEG_0_5): ffmpeg/ffmpeg.spec - build qt-faststart (merge from ...

[glen]

Author: glen                         Date: Fri Aug 27 10:28:11 2010 GMT
Module: packages                      Tag: FFMPEG_0_5
---- Log message:
- build qt-faststart (merge from 0.4.9 (AC-branch)); rel 3

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.193.2.2 -> 1.193.2.3) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.193.2.2 packages/ffmpeg/ffmpeg.spec:1.193.2.3
--- packages/ffmpeg/ffmpeg.spec:1.193.2.2	Wed Aug 25 08:51:47 2010
+++ packages/ffmpeg/ffmpeg.spec	Fri Aug 27 12:28:06 2010
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:		ffmpeg
 Version:	0.5.2
-Release:	2
+Release:	3
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, ac3, xvid, x264, faad)
 License:	GPL v3+ with LGPL v3+ parts
@@ -314,6 +314,7 @@
 sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
 
 %{__make}
+%{__make} tools/qt-faststart
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -335,15 +336,16 @@
 cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat
 cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf
 mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
+install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 
 # install as ffmpeg-avconfig to avoid with possible programs looking for
 # ffmpeg-config and expecting --libs output from it which is not implemented
 # simple to do (by querying pkgconfig), but why?
-install ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
+install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -375,6 +377,7 @@
 %defattr(644,root,root,755)
 %doc Changelog README doc/*.html doc/TODO
 %attr(755,root,root) %{_bindir}/ffmpeg
+%attr(755,root,root) %{_bindir}/qt-faststart
 %dir %{_datadir}/ffmpeg
 %{_datadir}/ffmpeg/*.ffpreset
 %{_mandir}/man1/ffmpeg.1*
@@ -455,6 +458,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193.2.3  2010/08/27 10:28:06  glen
+- build qt-faststart (merge from 0.4.9 (AC-branch)); rel 3
+
 Revision 1.193.2.2  2010/08/25 06:51:47  glen
 - fix libvdpau arch; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.193.2.2&r2=1.193.2.3&f=u