- Req user-http

Changed files:
    apache.spec -> 1.230

diff --git a/apache.spec b/apache.spec
index 2a98c3b09509f9c35941211d74c656b4c55956f6..377d2d902a75e931dcfa19529adc0a6de201969d 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -58,15 +58,10 @@ BuildRequires:      zlib-devel
 BuildRequires: libtool
 PreReq:                perl
 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-http
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,postun): /sbin/ldconfig
 Requires(post):                fileutils
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 Requires:      mailcap
 Requires:      /etc/mime.types
 Requires:      psmisc >= 20.1
@@ -736,24 +731,6 @@ ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ -n "`getgid http`" ]; then
-       if [ "`getgid http`" != "51" ]; then
-               echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 51 -r -f http
-fi
-if [ -n "`id -u http 2>/dev/null`" ]; then
-       if [ "`id -u http`" != "51" ]; then
-               echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
-fi
-
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add httpd
@@ -775,10 +752,6 @@ fi
 
 %postun
 /sbin/ldconfig
-if [ "$1" = "0" ]; then
-       /usr/sbin/userdel http
-       /usr/sbin/groupdel http
-fi
 
 %post mod_actions
 if [ -f /var/lock/subsys/httpd ]; then