- -ffserver subpackage

Changed files:
    ffmpeg.spec -> 1.79

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2b334bd6893b9ae66d7738d32db9dbf951144845..b5cbd22606375ebc4e4f822dd3adebd888550b9a 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,13 +1,9 @@
-# TODO:
-# - separate ffserver and its config to separate server package.
-#   Make whole init-stuff for it.
-#
 # Conditional build:
 %bcond_without imlib2          # we can safely play without it:-)
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
 #
 %define        snap    20060129
-%define        _rel 8.2
+%define        _rel 8.3
 Summary:       Realtime audio/video encoder and streaming server
 Summary(pl):   Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:          ffmpeg
@@ -15,11 +11,13 @@ Version:    0.4.9
 Release:       3.%{snap}.%{_rel}
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 License:       GPL
-Group:         Daemons
+Group:         Applications/Multimedia
 #Source0:      http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
 #Source0:      ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
 Source0:       %{name}-%{snap}.tar.bz2
 # Source0-md5: d8ea09431d6c0c91bfd35e0ca74a67e1
+Source1:       ffserver.init
+Source2:       ffserver.sysconfig
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-libdir.patch
 Patch2:                %{name}-gcc4.patch
@@ -161,6 +159,16 @@ obs
 przepuszczany przez strftime, wiêc ³atwo umie¶ciæ datê i czas na
 obrazie.
 
+%package ffserver
+Summary:       FFserver video server
+Group:         Daemons
+
+%description ffserver
+FFserver is a streaming server for both audio and video. It supports
+several live feeds, streaming from files and time shifting on live
+feeds (you can seek to positions in the past on each live feed,
+provided you specify a big enough feed storage in ffserver.conf).
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
@@ -210,12 +218,14 @@ obrazie.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install xvmc_render.h $RPM_BUILD_ROOT%{_includedir}/ffmpeg
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver
 
 mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
 install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
@@ -230,10 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Changelog README doc/*.html doc/TODO
 %attr(755,root,root) %{_bindir}/ffmpeg
-%attr(755,root,root) %{_sbindir}/ffserver
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf
 %{_mandir}/man1/ffmpeg.1*
-%{_mandir}/man1/ffserver.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -274,3 +281,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/vhook/imlib2.so
 %endif
+
+%files ffserver
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ffserver
+%attr(755,root,root) %{_sbindir}/ffserver
+%attr(754,root,root) /etc/rc.d/init.d/ffserver
+%{_mandir}/man1/ffserver.1*