- rel 6 (rebuild with fixed %useradd/%groupadd macros)

[packages/cyrus-imapd.git] / cyrus-imapd.spec

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 3bd026674698b5a3ffe687f704421ed550ea2f1c..13eb7f51b9325d61dcf7a5fd991ea00bdf877b41 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,12 +1,10 @@
-# TODO:
-# - use net-snmp (it wants ucd-snmp)
 %include       /usr/lib/rpm/macros.perl
 Summary:       High-performance mail store with imap and pop3
 Summary(pl):   Wysoko wydajny serwer IMAP i POP3
 Summary(pt_BR):        Um servidor de mail de alto desempenho que suporta IMAP e POP3
 Name:          cyrus-imapd
 Version:       2.2.12
-Release:       3
+Release:       6
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
@@ -24,6 +22,7 @@ Source11:     %{name}.init
 Source12:      cyrus.conf
 Patch0:                %{name}-et.patch
 Patch1:                %{name}-shared.patch
+Patch2:                %{name}-quota.patch
 URL:           http://andrew2.andrew.cmu.edu/cyrus/imapd/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -32,20 +31,20 @@ BuildRequires:      db-devel >= 4.1.25
 BuildRequires: flex
 BuildRequires: libcom_err-devel >= 1.21
 BuildRequires: libtool
+BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.202
-#BuildRequires:        ucd-snmp-devel >= 4.2.6
-PreReq:                rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      rc-scripts
 # needed by scripts from %{_bindir}
-Requires:      perl-%{name} = %{version}-%{release}
 Requires:      pam >= 0.79.0
+Requires:      perl-%{name} = %{version}-%{release}
 Provides:      imapdaemon
 Provides:      pop3daemon
 Provides:      user(cyrus)
@@ -163,6 +162,7 @@ Perlowy interfejs do biblioteki cyrus-imapd.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm -rf autom4te.cache
 
@@ -254,17 +254,11 @@ chmod 640 /var/lib/imap/faillog
 cd /var/lib/imap
 chattr +S . user quota user/* quota/* 2>/dev/null ||:
 chattr +S /var/spool/imap /var/spool/imap/* 2>/dev/null ||:
-if [ -f /var/lock/subsys/cyrus-imapd ]; then
-       /etc/rc.d/init.d/cyrus-imapd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/cyrus-imapd start\" to start cyrus imap daemon."
-fi
+%service cyrus-imapd "cyrus imap daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/cyrus-imapd ]; then
-               /etc/rc.d/init.d/cyrus-imapd stop 1>&2
-       fi
+       %service cyrus-imapd stop
        /sbin/chkconfig --del cyrus-imapd
 fi