- Req user-zope

Changed files:
    Zope.spec -> 1.17

diff --git a/Zope.spec b/Zope.spec
index 0b2ee99ce800f7445d5e19700ff72c79e3b0aaf2..581ec8f87134587b5abd8d4fb342a593b5a9c713 100644 (file)
--- a/Zope.spec
+++ b/Zope.spec
@@ -21,13 +21,8 @@ Source10:    http://www.zope.org/Documentation/Books/ZopeBook/current/ZopeBook.tgz
 URL:           http://www.zope.org/
 BuildRequires: python-devel >= 2.2
 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-zope
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
 Requires:      logrotate
 Requires:      python-modules >= 2.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -118,17 +113,6 @@ touch $RPM_BUILD_ROOT/var/log/zope
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ -z "`getgid zope`" ]; then
-       echo "Making group zope"
-       /usr/sbin/groupadd -r -f zope
-fi
-
-if [ -z "`id -u zope 2>/dev/null`" ]; then
-       echo "Making user zope"
-       /usr/sbin/useradd -r -d /var/lib/zope -s /bin/false -c "Zope User" -g zope zope
-fi
-
 %post
 /sbin/chkconfig --add zope
 if [ -f /var/lock/subsys/zope ]; then
@@ -146,14 +130,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del zope
 fi
 
-%postun
-if [ "$1" = "0" ] ; then
-       echo "Removing user zope"
-       /usr/sbin/userdel zope >/dev/null 2>&1 || :
-       echo "Removing group zope"
-       /usr/sbin/groupdel zope >/dev/null 2>&1 || :    
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc doc/*.txt *.txt ZopeContentManagersGuide GuideToZSQL Tutorial ZopeDevelopersGuide ZopeAdminGuide ZopeBook