- C: logrotate < 3.7.4 due to archiv -> archive transition

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index bfff93d8d76aad97653e9e6f5316cd6dc199a364..3b55ea5403e690541b44f50db495c3190f020d62 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -14,15 +14,15 @@ Summary:    University of Cambridge Mail Transfer Agent
 Summary(pl.UTF-8):     Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
-Version:       4.66
-Release:       3
+Version:       4.68
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 01288e44919d8abdde5a7bd2c200449b
+# Source0-md5: 94c46a8bc24b3ad4ad892228449f378b
 Source1:       ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-%{version}.tar.bz2
-# Source1-md5: f45a204f3865afa2d72b0fbd3eff8bf8
+# Source1-md5: bb5e87e0bbd8770c364b21ca35747a00
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -52,7 +52,6 @@ Patch6:               %{name}-noloadbalance.patch
 # http://sourceforge.net/projects/eximdsn/
 Patch7:                %{name}_463_dsn_1_3.patch
 Patch8:                %{name}-spam-timeout.patch
-Patch9:                %{name}-bug-461.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
 BuildRequires: db-devel
@@ -72,6 +71,7 @@ BuildRequires:        rpmbuild(macros) >= 1.268
 BuildRequires: texinfo >= 4.7
 %{?with_whoson:BuildRequires:  whoson-devel}
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXaw-devel
 Requires(post):        /bin/hostname
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
@@ -88,20 +88,8 @@ Requires:    rc-scripts
 Provides:      group(exim)
 Provides:      smtpdaemon
 Provides:      user(exim)
-Obsoletes:     courier
-Obsoletes:     masqmail
-Obsoletes:     nullmailer
-Obsoletes:     omta
-Obsoletes:     postfix
-Obsoletes:     qmail
-Obsoletes:     qmail-client
-Obsoletes:     sendmail
-Obsoletes:     sendmail-cf
-Obsoletes:     sendmail-doc
-Obsoletes:     smail
 Obsoletes:     smtpdaemon
-Obsoletes:     ssmtp
-Obsoletes:     zmailer
+Conflicts:     logrotate < 3.7.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -173,7 +161,6 @@ Pliki nagłówkowe dla Exima.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 install %{SOURCE13} doc/FAQ.txt.bz2
 install %{SOURCE14} doc/config.samples.tar.bz2
@@ -205,9 +192,9 @@ makeinfo --force -o exim.info exim-texinfo-*/doc/spec.texinfo
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail
-install -d $RPM_BUILD_ROOT/etc/{cron.{daily,weekly},logrotate.d,rc.d/init.d,sysconfig,pam.d}
+install -d $RPM_BUILD_ROOT/etc/{cron.{daily,weekly},logrotate.d,rc.d/init.d,sysconfig,pam.d,security}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8,%{_prefix}/lib}
-install -d $RPM_BUILD_ROOT%{_var}/{spool/exim/{db,input,msglog},log/{archiv,}/exim,mail}
+install -d $RPM_BUILD_ROOT%{_var}/{spool/exim/{db,input,msglog},log/{archive,}/exim,mail}
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_desktopdir},%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
 
@@ -278,13 +265,6 @@ if [ "$1" = "0" ]; then
        %groupremove exim
 fi
 
-%triggerpostun -- exim  < 3.90
-if [ -f /etc/mail/exim.conf ]; then
-       umask 022
-       mv /etc/mail/exim.conf /etc/mail/exim.conf.3
-       /usr/bin/convert4r4 < /etc/mail/exim.conf.3 > /etc/mail/exim.conf
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc README* NOTICE LICENCE analyse-log-errors doc/{ChangeLog,NewStuff,dbm.discuss.txt,filter.txt,spec.txt,Exim*.upgrade,OptionLists.txt,experimental-spec.txt} build-Linux-*/transport-filter.pl
@@ -292,7 +272,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim
-%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim
 %attr(754,root,root) /etc/rc.d/init.d/exim
 %attr(4755,root,root) %{_bindir}/exim
 %attr(770,root,exim) %dir %{_var}/spool/exim
@@ -317,7 +297,7 @@ fi
 %attr(755,root,root) %{_prefix}/lib/sendmail
 %attr(754,root,root) /etc/cron.weekly/exim.cron.db
 %attr(750,exim,root) %dir %{_var}/log/exim
-%attr(750,exim,root) %dir %{_var}/log/archiv/exim
+%attr(750,exim,root) %dir %{_var}/log/archive/exim
 %attr(640,exim,root) %ghost %{_var}/log/exim/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp