- run as ffserver

Changed files:
    ffmpeg.spec -> 1.84
    ffserver.init -> 1.3

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 86671188b6534bbc7dfa6ffbcd20170df7c53b2d..901b6b0aadd7f6a927cafa1c4a6806287f1630a2 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -3,7 +3,7 @@
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
 #
 %define        snap    20060129
-%define        _rel 8.5
+%define        _rel 8.6
 Summary:       Realtime audio/video encoder and streaming server
 Summary(pl):   Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:          ffmpeg
@@ -18,6 +18,7 @@ Source0:      %{name}-%{snap}.tar.bz2
 # Source0-md5: d8ea09431d6c0c91bfd35e0ca74a67e1
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
+Source3:       ffserver.conf
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-libdir.patch
 Patch2:                %{name}-gcc4.patch
@@ -221,7 +222,8 @@ provided you specify a big enough feed storage in ffserver.conf).
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
+       $RPM_BUILD_ROOT/var/{cache,log}/ffserver
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -229,9 +231,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.
 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
-
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf
 mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
-install doc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,16 +240,26 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
+%pre ffserver
+%groupadd -g 167 ffserver
+%useradd -g ffserver -u 167 ffserver
+
 %post ffserver
 /sbin/chkconfig --add ffserver
 %service ffserver restart
 
-%postun ffserver
+%preun ffserver
 if [ "$1" = 0 ]; then
        %service ffserver stop
        /sbin/chkconfig --del ffserver
 fi
 
+%postun ffserver
+if [ "$1" = 0 ]; then
+       %userremove ffserver
+       %groupremove ffserver
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc Changelog README doc/*.html doc/TODO
@@ -302,3 +313,5 @@ fi
 %attr(755,root,root) %{_sbindir}/ffserver
 %attr(754,root,root) /etc/rc.d/init.d/ffserver
 %{_mandir}/man1/ffserver.1*
+%dir %attr(770,root,ffserver) /var/cache/ffserver
+%dir %attr(770,root,ffserver) /var/log/ffserver

diff --git a/ffserver.init b/ffserver.init
index f295c038eed87957dd3920cdefad0f346271951e..5970569f3d2292f1adb98836d9d5ca89952ae03a 100644 (file)
--- a/ffserver.init
+++ b/ffserver.init
@@ -33,7 +33,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/ffserver ]; then
                msg_starting ffserver
-               daemon --fork ffserver
+               daemon --user ffserver ffserver
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ffserver
        else