X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=711ccc717ff58f89d734a44128d4782ebe240624;hb=060f6153fb672557b54d50860ebad9452edc3d65;hp=6700a651baf7c889fb4dc7ca18a948a160d1f6f1;hpb=bb13720e5e14dbb40dcb8441bdc8c79297ad1199;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index 6700a65..711ccc7 100644
--- a/exim.spec
+++ b/exim.spec
@@ -19,19 +19,20 @@
 %undefine	with_hiredis
 %endif
 
+%include	/usr/lib/rpm/macros.perl
 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.1
-Release:	1
+Version:	4.92
+Release:	5
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	6e65d9fc17449dcde6254bd312c64822
+# Source0-md5:	c2c34e7e0c3956d2b93c458106c9dc22
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	e633e855fa08855b4c0cae28eb7888bc
+# Source1-md5:	ab60afdcf56f28e85d74f299ffc12cf7
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -48,9 +49,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:	eccff092ef49b6e0f159d75c286abc4e
+# Patch100-md5:	7d26da1d8b32ebabe0cbd3b721a45e7e
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
@@ -58,12 +59,10 @@ 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
+Patch6:		exim-bug-1891.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}
@@ -84,6 +83,7 @@ BuildRequires:	perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_sqlite:BuildRequires:	sqlite3-devel}
 %{?with_whoson:BuildRequires:	whoson-devel}
@@ -177,7 +177,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
-#%patch100 -p2
+%patch100 -p2
 
 %patch0 -p1
 %patch1 -p1
@@ -189,8 +189,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 +201,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 +216,7 @@ EXPERIMENTAL_DMARC=yes
 LOOKUP_LIBS+=-lopendmarc
 %endif
 %if %{with spf}
-EXPERIMENTAL_SPF=yes
+SUPPORT_SPF=yes
 LOOKUP_LIBS+=-lspf2
 %endif
 %if %{with srs}
@@ -364,7 +363,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,experimental-spec.txt} build-Linux-*/transport-filter.pl
-%doc exim-html-*/doc/html
+%doc exim-html-*/exim-html-*/doc/html
 %dir %{_sysconfdir}/mail
 %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