- --enable-nntp

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

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index b7dcded8962d983e38e07cb5e399bed1185df9c0..7dff3b5c74f2555b7501364d26252d6783872d88 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -5,12 +5,12 @@ 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.3
-Release:       0.3
+Version:       2.2.12
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
-# Source0-md5: 32888c5120edeb2867d6283fedbdb7d5
+# Source0-md5: 70b3bba526a8d36d3bb23a87d37e9188
 Source1:       cyrus-README
 Source2:       cyrus-procmailrc
 Source3:       cyrus-deliver-wrapper.c
@@ -22,11 +22,10 @@ Source9:    %{name}.pamd
 Source10:      %{name}-pop.pamd
 Source11:      %{name}.init
 Source12:      cyrus.conf
-Patch0:                %{name}-mandir.patch
-Patch1:                %{name}-et.patch
-Patch2:                %{name}-shared.patch
+Patch0:                %{name}-et.patch
+Patch1:                %{name}-shared.patch
 URL:           http://andrew2.andrew.cmu.edu/cyrus/imapd/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.54
 BuildRequires: automake
 BuildRequires: cyrus-sasl-devel >= 1.5.27
 BuildRequires: db-devel >= 4.1.25
@@ -35,15 +34,20 @@ BuildRequires:      libcom_err-devel >= 1.21
 BuildRequires: libtool
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl-devel >= 1:5.8.0
+BuildRequires: rpmbuild(macros) >= 1.159
 #BuildRequires:        ucd-snmp-devel >= 4.2.6
 PreReq:                rc-scripts
+Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
+# needed by scripts from %{_bindir}
+Requires:      perl-%{name} = %{version}-%{release}
 Requires:      pam >= 0.77.3
 Provides:      imapdaemon
 Provides:      pop3daemon
+Provides:      user(cyrus)
 Obsoletes:     imap
 Obsoletes:     imapd
 Obsoletes:     imapdaemon
@@ -85,8 +89,8 @@ Pe
 ¶rodowiska poczty i elektronicznej tablicy og³oszeniowej na kilku
 serwerach. Tym siê ró¿ni od innych implementacji serwerów IMAP, ¿e
 jest uruchamiany na "opieczêtowanych" serwerach, na które w normalnych
-waunkach u¿ytkownicy nie mog± siê zalogowaæ. Baza danych skrzynek
-pocztowych jest pzrechowywana w tych czê¶ciach systemu plików, które
+warunkach u¿ytkownicy nie mog± siê zalogowaæ. Baza danych skrzynek
+pocztowych jest przechowywana w tych czê¶ciach systemu plików, które
 s± dostêpne jedynie dla systemu IMAP Cyrus. Wszelki dostêp do poczty
 ma miejsce poprzez oprogramowanie wykorzystuj±ce protoko³y IMAP, POP3
 oraz KPOP.
@@ -158,7 +162,6 @@ Perlowy interfejs do biblioteki cyrus-imapd.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 rm -rf autom4te.cache
 
@@ -174,7 +177,7 @@ cd ..
 %{__aclocal} -I cmulocal
 %{__autoheader}
 %{__autoconf}
-cp -f %{_datadir}/automake/config.*   .
+cp -f %{_datadir}/automake/config.* .
 cp -f %{_datadir}/automake/install-sh .
 %configure \
        --with-auth=unix \
@@ -182,7 +185,8 @@ cp -f %{_datadir}/automake/install-sh .
        --with-cyrus-prefix=%{_libexecdir} \
        --with-service-path=%{_libexecdir} \
        --with-com_err=/usr \
-       --with-perl=%{__perl}
+       --with-perl=%{__perl} \
+       --enable-nntp
 %{__make} \
        INSTALLDIRS=vendor
 
@@ -239,13 +243,14 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`id -u cyrus 2>/dev/null`" ]; then
-       if [ "`id -u cyrus`" != "76" ]; then
+if [ -n "`/bin/id -u cyrus 2>/dev/null`" ]; then
+       if [ "`/bin/id -u cyrus`" != 76 ]; then
                echo "Error: user cyrus doesn't have uid=76. Correct this before installing cyrus-imapd." 1>&2
                exit 1
        fi
 else
-       /usr/sbin/useradd -u 76 -r -d /var/spool/imap -s /bin/false -c "Cyrus User" -g mail cyrus 1>&2
+       /usr/sbin/useradd -u 76 -d /var/spool/imap -s /bin/false \
+               -c "Cyrus User" -g mail cyrus 1>&2
 fi
 
 %post
@@ -254,8 +259,8 @@ touch /var/lib/imap/faillog
 chown cyrus:mail /var/lib/imap/faillog
 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
+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
@@ -272,7 +277,7 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel cyrus
+       %userremove cyrus
 fi
 
 %post  libs -p /sbin/ldconfig
@@ -283,7 +288,7 @@ fi
 %doc cyrus-README cyrus-procmailrc cyrus-user-procmailrc.template
 %doc cyrus-imapd-procmail+cyrus.mc COPYRIGHT doc/*.html tools
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
-%attr(640,root,root) /etc/logrotate.d/cyrus-imapd
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/cyrus-imapd
 %attr(440,cyrus,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/*
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.*
 %attr(754,root,root) /etc/rc.d/init.d/cyrus-imapd
@@ -316,6 +321,8 @@ fi
 %attr(755,root,root) %{_libexecdir}/squatter
 %attr(755,root,root) %{_libexecdir}/timsieved
 %attr(755,root,root) %{_libexecdir}/tls_prune
+%attr(755,root,root) %{_libexecdir}/fetchnews
+%attr(755,root,root) %{_libexecdir}/nntpd
 
 %attr(750,cyrus,mail) /var/spool/imap
 %attr(750,cyrus,mail) %dir /var/lib/imap