- Req user-frox

Changed files:
    frox.spec -> 1.26

diff --git a/frox.spec b/frox.spec
index 480f71cc10633816cc04222d3e0a86ead87ab9fb..b3972f444fb1e00cad7bf34be6e0ab3993d81aaf 100644 (file)
--- a/frox.spec
+++ b/frox.spec
@@ -22,13 +22,8 @@ URL:         http://frox.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 PreReq:                rc-scripts
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
+Requires(pre): user-frox
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,16 +68,6 @@ install %{SOURCE2}   $RPM_BUILD_ROOT/etc/sysconfig/frox
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ ! -n "`getgid frox`" ]; then
-       /usr/sbin/groupadd -g 97 -r -f frox 1>&2 || :
-fi
-
-if [ ! -n "`id -u frox 2>/dev/null`" ]; then
-       /usr/sbin/useradd -M -o -r -u 97 -s /bin/false \
-               -g frox -c "FROX ftp caching daemon" -d /var/cache/frox frox 1>&2 || :
-fi
-
 %post
 /sbin/chkconfig --add frox
 if [ -f /var/lock/subsys/frox ]; then
@@ -99,12 +84,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del frox
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       /usr/sbin/userdel frox 2> /dev/null
-       /usr/sbin/groupdel frox 2> /dev/null
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc doc/{FAQ,README.transdata,RELEASE,SECURITY,TODO}