- Req user-http

Changed files:
    mathopd.spec -> 1.10

diff --git a/mathopd.spec b/mathopd.spec
index 82efd435fd6466cca91bf51d0de760ffb7f2538b..fa52fa9af2b5e63659d3d06462334645272ad9ca 100644 (file)
--- a/mathopd.spec
+++ b/mathopd.spec
@@ -12,13 +12,8 @@ URL:         http://www.mathopd.org/
 Provides:      httpd
 Provides:      webserver
 Requires(pre): sh-utils
-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(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,24 +49,6 @@ install src/mathopd $RPM_BUILD_ROOT%{_sbindir}
 %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 %{name}." 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 %{name}." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
-fi
-
 %post
 /sbin/chkconfig --add %{name}
 if [ -f /var/lock/subsys/mathopd ]; then
@@ -88,12 +65,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       /usr/sbin/userdel http
-       /usr/sbin/groupdel http
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc [A-Z]* doc/*