- Req user-cyrus

Changed files:
    cyrus-imapd.spec -> 1.68

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index e624ea07451c45ba151d1c4407a0230b04393ffe..cd0b8cb0938e9a022473d66ff002b1daf3b9f314 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -34,9 +34,8 @@ BuildRequires:        openssl-devel >= 0.9.7
 BuildRequires: perl-devel >= 5.6.1
 #BuildRequires:        ucd-snmp-devel >= 4.2.6
 PreReq:                rc-scripts
-Requires(pre): /usr/sbin/useradd
+Requires(pre): user-cyrus
 Requires(post,preun):/sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
 Provides:      imapdaemon
 Provides:      pop3daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -221,11 +220,6 @@ for i in `%{__perl} -le 'print for "a".."z"'`; do
        mkdir -p -m 0755 $RPM_BUILD_ROOT%{_var}/spool/imap/$i
 done
 
-%pre
-if [ -z "`id -u cyrus 2>/dev/null`" ]; then
-       /usr/sbin/useradd -u 76 -r -d /var/spool/imap -s /bin/false -c "Cyrus User" -g mail cyrus 1>&2
-fi
-
 %post
 /sbin/chkconfig --add cyrus-imapd
 touch /var/lib/imap/faillog
@@ -248,11 +242,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del cyrus-imapd
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-       /usr/sbin/userdel cyrus
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT