SPECS: ffmpeg.spec - add ffmpeg-config to -devel from debian (mayb...

[glen]

Author: glen                         Date: Sun Apr 16 15:34:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add ffmpeg-config to -devel from debian (maybe pointless due .pc files?)

---- Files affected:
SPECS:
   ffmpeg.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.81 SPECS/ffmpeg.spec:1.82
--- SPECS/ffmpeg.spec:1.81	Sun Apr 16 17:22:57 2006
+++ SPECS/ffmpeg.spec	Sun Apr 16 17:34:07 2006
@@ -22,6 +22,7 @@
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-gcc4.patch
+Patch3:		%{name}-config.patch
 URL:		http://ffmpeg.sourceforge.net/
 BuildRequires:	SDL-devel
 BuildRequires:	faac-devel
@@ -164,8 +165,8 @@
 %package ffserver
 Summary:	FFserver video server
 Group:		Daemons
-Requires(post,preun):	rc-scripts >= 0.4.0.10
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun):	rc-scripts >= 0.4.0.10
 
 %description ffserver
 FFserver is a streaming server for both audio and video. It supports
@@ -178,6 +179,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # notes:
@@ -234,6 +236,9 @@
 mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
 install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
+sed 's/@VERSION@/%{version}/' ffmpeg-config.in > $RPM_BUILD_ROOT%{_bindir}/ffmpeg-config
+install ffmpeg-config.1 $RPM_BUILD_ROOT%{_mandir}/man1/ffmpeg-config.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -272,6 +277,7 @@
 %files devel
 %defattr(644,root,root,755)
 %doc doc/optimization.txt
+%attr(755,root,root) %{_bindir}/ffmpeg-config
 %attr(755,root,root) %{_libdir}/libavcodec.so
 %attr(755,root,root) %{_libdir}/libavformat.so
 %attr(755,root,root) %{_libdir}/libavutil.so
@@ -280,6 +286,7 @@
 %{_includedir}/ffmpeg
 %{_includedir}/postproc
 %{_pkgconfigdir}/*.pc
+%{_mandir}/man1/ffmpeg-config.1*
 
 %files static
 %defattr(644,root,root,755)
@@ -310,6 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2006/04/16 15:34:07  glen
+- add ffmpeg-config to -devel from debian (maybe pointless due .pc files?)
+
 Revision 1.81  2006/04/16 15:22:57  glen
 - rc-scripts with --fork cap
 
@@ -480,7 +490,7 @@
 - bcond: imlib -> imlib2.
 
 Revision 1.33  2004/02/28 17:31:12  saq
-- more general ix86 %%ifarchs
+- more general ix86 %ifarchs
 
 Revision 1.32  2004/02/24 04:15:30  pluto
 - gcc 3.4 fixes.
@@ -551,7 +561,7 @@
 - release 3: use new %doc.
 
 Revision 1.13  2002/04/25 16:17:50  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.12  2002/02/22 23:28:50  kloczek
 - removed all Group fields translations (our rpm now can handle translating
@@ -562,14 +572,14 @@
 - release 2
 
 Revision 1.10  2002/01/18 02:12:55  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.9  2001/09/08 13:45:39  qboosh
 - ugh? disable-mmx on archs _other_ than i[56]86, not on i[56]86
 
 Revision 1.8  2001/09/05 16:40:03  filon
 - updated to 0.4.5
-- updated opt patch, added configure (don't change to %%configure - it's not compatibile)
+- updated opt patch, added configure (don't change to %configure - it's not compatibile)
 
 Revision 1.7  2001/08/12 10:24:43  qboosh
 - opt patch
@@ -584,7 +594,7 @@
 - Removed %{rpmcflags} macro (doesn't compile with)
 
 Revision 1.4  2001/04/30 16:05:17  kloczek
-- added using %%{rpmcflags} macro.
+- added using %{rpmcflags} macro.
 
 Revision 1.3  2001/03/29 09:23:40  mis
 - autoupdated to 0.3.4
@@ -593,4 +603,4 @@
 - spec adapterized.
 
 Revision 1.1  2001/02/17 16:49:12  misiek
-New. Audio/Video encoder and streaming server
+- New. Audio/Video encoder and streaming server
================================================================

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