- rel 3; one more dkim fix

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index f94f0fbe9c973923687ee5ab5d90b6685c2d502d..27fd4e8867ec946e9d44f3adc8b1bade030c3cd1 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -23,15 +23,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.88
-Release:       1
+Version:       4.90
+Release:       3
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: 4cc10c910fd18bb9e299e98bc0a32ed2
+# Source0-md5: 29a14c4bd29b553c0dfc13036225ebdd
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 8c428933dd52ab8bf12f21c22083d5a3
+# Source1-md5: a728618fb641f4b9eb56deeefdb0cf67
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}4.conf
@@ -48,8 +48,9 @@ Source14:     ftp://ftp.exim.org/pub/exim/exim4/old/config.samples.tar.bz2
 # Source14-md5:        4b93321938a800caa6127c48ad60a42b
 Source15:      %{name}4-smtp.pamd
 Source16:      %{name}on.png
-# git log -p exim-4_87..exim-4_87+fixes --reverse -- . ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" > exim-git.patch
+# sh branch.sh
 Patch100:      %{name}-git.patch
+# Patch100-md5:        0fa27560685543eb8b13cb68f5a7d1ef
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -69,6 +70,7 @@ BuildRequires:        db-devel
 %{?with_dmarc:BuildRequires:   opendmarc-devel}
 %{?with_hiredis:BuildRequires: hiredis-devel}
 BuildRequires: libidn-devel
+BuildRequires: libidn2-devel
 %{?with_spf:BuildRequires:     libspf2-devel >= 1.2.5-2}
 %{?with_srs:BuildRequires:     libsrs_alt-devel >= 1.0}
 %{?with_lmdb:BuildRequires:    lmdb-devel}
@@ -174,7 +176,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-#%patch100 -p2
+%patch100 -p2
 
 %patch0 -p1
 %patch1 -p1
@@ -205,7 +207,8 @@ EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
 SUPPORT_I18N=yes
-LDFLAGS+= -lidn
+SUPPORT_I18N_2008=yes
+LDFLAGS+= -lidn -lidn2
 SUPPORT_PROXY=yes
 %if %{with dmarc}
 EXPERIMENTAL_DMARC=yes