- rel 4; more fixes

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index b1a6b2e9c2dbe1e2b5f79069394b54bb8e8a6642..a6738741c20b2c4a4463fd1d2e732ca7c2a00e77 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.89
+Version:       4.90
 Release:       4
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5: ef78f2f669e429988c61d2dfb5a340b9
+# Source0-md5: 29a14c4bd29b553c0dfc13036225ebdd
 Source1:       ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5: 47382a69ca8beb441b8d017dffa00942
+# 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:        49c0ff1c92d6e19a052e5a2b615fc6e4
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
@@ -57,7 +58,6 @@ Patch3:               exim-defs.patch
 Patch4:                %{name}4-Makefile-Default.patch
 # http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch
 Patch5:                localscan_dlopen_%{name}_4.20_or_better.patch
-Patch6:                exim-commandline_checks_require_admin.patch
 
 Patch8:                %{name}-spam-timeout.patch
 
@@ -176,7 +176,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-#%patch100 -p2
+%patch100 -p2
 
 %patch0 -p1
 %patch1 -p1
@@ -184,7 +184,6 @@ Pliki nagłówkowe dla Exima.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
 
 %patch8 -p1