- better english

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 6b72ad80b1dd16725326ec14a1b197a3cb6d1bdd..9ce81de09dc5b9f97c2842725e27000656e8ce92 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -5,26 +5,24 @@
 %bcond_without whoson  # without whoson support
 %bcond_without sasl    # without SASL
 %bcond_without ldap    # without LDAP support
-%bcond_without exiscan # without exiscan support
 %bcond_without spf     # without spf support
 %bcond_without srs     # without srs support
 %bcond_with    saexim  # with sa-exim support
 #
-%define                exiscan_version 4.44-28
-%define                saexim_version 3.1
+%define                saexim_version 4.2
 Summary:       University of Cambridge Mail Transfer Agent
 Summary(pl):   Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR):        Servidor de correio eletrônico exim
 Name:          exim
-Version:       4.44
+Version:       4.50
 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: 7487274e013b598d97445987d38b2071
-Source1:       ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-4.40.tar.bz2
-# Source1-md5: cc91bd804ee0f7fd70991e2e6b529033
+# Source0-md5: 7844eff82171872f6b3971a4183368d9
+Source1:       ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-4.50.tar.bz2
+# Source1-md5: a12993436e9943083e3ce5b76cf96b11
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -33,8 +31,6 @@ Source6:      %{name}on.desktop
 # 20021016: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/
 Source7:       %{name}4-man-021016.tar.bz2
 # Source7-md5: b552704ebf853a401946038a2b7e8e98
-Source8:       http://duncanthrax.net/exiscan-acl/exiscan-acl-%{exiscan_version}.patch.bz2
-# Source8-md5: 72ef5567106e89e6cef1cc742ab52525
 Source9:       %{name}.aliases
 Source10:      newaliases
 Source11:      %{name}.logrotate
@@ -46,13 +42,12 @@ Source14:   ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/config.samples.t
 Source15:      %{name}4-smtp.pamd
 Source16:      %{name}on.png
 Source17:      http://marc.merlins.org/linux/exim/files/sa-exim-%{saexim_version}.tar.gz
-# Source17-md5:        34892f195384c127f7c40c461a9ef421
+# Source17-md5:        ad76f73c6b3d01caa88078e3e622745a
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-texinfo.patch
 Patch3:                %{name}4-use_system_pcre.patch
 Patch4:                %{name}4-Makefile-Default.patch
-Patch5:                %{name}4-exiscan-pld.patch
 URL:           http://www.exim.org/
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.0.0}
 %{?with_spf:BuildRequires:     libspf2-devel}
@@ -154,8 +149,6 @@ desta interface.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
-%{?with_exiscan:test -f %{SOURCE8} || exit 1; bzip2 -d -c %{SOURCE8} | patch -p1 || exit 1}
 %{?with_saexim:test -f %{SOURCE17} || exit 1; gzip -d -c %{SOURCE17} | tar -x || exit 1}
 
 install %{SOURCE13} doc/FAQ.txt.bz2
@@ -178,7 +171,7 @@ cp -f exim_monitor/EDITME Local/eximon.conf
 
 %{__make} -j1 \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} %{?with_spf:-DSPF} %{?with_srs:-DSRS}" \
+       CFLAGS="%{rpmcflags} %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes}" \
        LOOKUP_CDB=yes \
        XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \
        X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \
@@ -239,7 +232,7 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 if [ -n "`/usr/bin/getgid exim`" ]; then
        if [ "`/usr/bin/getgid exim`" != 79 ]; then
-               echo "Warning: group exim haven't gid=79. Correct this before installing exim" 1>&2
+               echo "Warning: group exim doesn't have gid=79. Correct this before installing exim" 1>&2
                exit 1
        fi
 else
@@ -262,7 +255,7 @@ umask 022
 if [ -f /var/lock/subsys/exim ]; then
        /etc/rc.d/init.d/%{name} restart >&2
 else
-       %banner %{name} -e << EOF
+       %banner %{name} -e <<EOF
 Run \"/etc/rc.d/init.d/%{name} start\" to start exim daemon.
 EOF
 fi
@@ -298,7 +291,7 @@ 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%{?with_exiscan:,exiscan-*.txt}} build-Linux-*/transport-filter.pl
+%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
 %dir %{_sysconfdir}/mail
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf
 %{?with_saexim:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/sa-exim.conf}