- rel 6; small fixes from upstream

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index c0d6f93db631154af63157a43df1df140ba7761f..5b179f29551b99c12be6d5602a59266084d3aab2 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -24,15 +24,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.90
-Release:       8
+Version:       4.91
+Release:       6
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 29a14c4bd29b553c0dfc13036225ebdd
+# Source0-md5: e4db1e9013227539acfd662c3cf816d9
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: a728618fb641f4b9eb56deeefdb0cf67
+# Source1-md5: 587e1e9018b593f5c0a19a8205235db9
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -51,7 +51,7 @@ Source15:     %{name}4-smtp.pamd
 Source16:      %{name}on.png
 # sh branch.sh
 Patch100:      %{name}-git.patch
-# Patch100-md5:        d0478ffc571ad637ee501af29590b9db
+# Patch100-md5:        3b3cf0026749ce512daf950b0b3f5e8a
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -62,8 +62,6 @@ Patch5:               localscan_dlopen_%{name}_4.20_or_better.patch
 
 Patch8:                %{name}-spam-timeout.patch
 
-Patch10:       %{name}-force-sigalrm.patch
-
 Patch20:       %{name}4-disableSSLv3.patch
 URL:           http://www.exim.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
@@ -189,8 +187,6 @@ Pliki nagłówkowe dla Exima.
 
 %patch8 -p1
 
-%patch10 -p1
-
 install %{SOURCE4} exim4.conf
 install %{SOURCE14} doc/config.samples.tar.bz2
 %patch20 -p1
@@ -203,11 +199,12 @@ LOOKUP_CDB=yes
 XLFLAGS=-L%{_prefix}/X11R6/%{_lib}
 X11_LD_LIB=%{_prefix}/X11R6/%{_lib}
 %{?with_dynamic:LOOKUP_MODULE_DIR=%{_libdir}/%{name}/modules}
-EXPERIMENTAL_DANE=yes
+EXPERIMENTAL_ARC=yes
 EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
+SUPPORT_DANE=yes
 SUPPORT_I18N=yes
 SUPPORT_I18N_2008=yes
 LDFLAGS+= -lidn -lidn2
@@ -217,7 +214,7 @@ EXPERIMENTAL_DMARC=yes
 LOOKUP_LIBS+=-lopendmarc
 %endif
 %if %{with spf}
-EXPERIMENTAL_SPF=yes
+SUPPORT_SPF=yes
 LOOKUP_LIBS+=-lspf2
 %endif
 %if %{with srs}