X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=blobdiff_plain;f=exim.spec;h=c31aba6bd30eb5604f056044dbb6cdb1e7ca6c80;hp=38a810ff38e593faeab7c6e5983fa5ad41678a7a;hb=acd0d13;hpb=ae39ad09654a0c358fcf86ff88ade1b20c50d6be

diff --git a/exim.spec b/exim.spec
index 38a810f..c31aba6 100644
--- a/exim.spec
+++ b/exim.spec
@@ -8,7 +8,7 @@
 %bcond_without	ldap	# without LDAP support
 %bcond_without	spf	# without spf support
 %bcond_without	srs	# without srs support
-%bcond_without	dynamic # dynamic modules
+%bcond_with	dynamic # dynamic modules
 %bcond_without	hiredis # without redis
 # opendmarc.spec not ready, so off by default
 %bcond_with	dmarc	# DMARC support
@@ -19,20 +19,19 @@
 %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.92
-Release:	2
+Version:	4.94.2
+Release:	1
 Epoch:		2
-License:	GPL
+License:	GPL v2+
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	c2c34e7e0c3956d2b93c458106c9dc22
+# Source0-md5:	e484d048bf0541a27951560ce3bf6d93
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	ab60afdcf56f28e85d74f299ffc12cf7
+# Source1-md5:	50cbdaecc5542cb2dfa382aa041fe2bc
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -51,7 +50,7 @@ Source15:	%{name}4-smtp.pamd
 Source16:	%{name}on.png
 # sh branch.sh
 Patch100:	%{name}-git.patch
-# Patch100-md5:	56f4bdc1806cbadf2b2a0abad6edf956
+# Patch100-md5:	b66ef47d261dab43db2a23a02936e443
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
 Patch2:		%{name}4-cflags.patch
@@ -66,7 +65,6 @@ Patch20:	%{name}4-disableSSLv3.patch
 URL:		http://www.exim.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
 BuildRequires:	db-devel
-%{?with_dmarc:BuildRequires:	opendmarc-devel}
 %{?with_hiredis:BuildRequires:	hiredis-devel}
 BuildRequires:	libidn-devel
 BuildRequires:	libidn2-devel
@@ -74,6 +72,7 @@ BuildRequires:	libidn2-devel
 %{?with_srs:BuildRequires:	libsrs_alt-devel >= 1.0}
 %{?with_lmdb:BuildRequires:	lmdb-devel}
 %{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_dmarc:BuildRequires:	opendmarc-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
@@ -177,7 +176,6 @@ Pliki nagłówkowe dla Exima.
 %prep
 %setup -q -a1 -a7
 %patch100 -p2
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -204,13 +202,14 @@ EXPERIMENTAL_DCC=yes
 EXPERIMENTAL_PRDR=yes
 EXPERIMENTAL_DSN_INFO=yes
 EXPERIMENTAL_QUEUEFILE=yes
+EXPERIMENTAL_QUEUE_RAMP=yes
 SUPPORT_DANE=yes
 SUPPORT_I18N=yes
 SUPPORT_I18N_2008=yes
 LDFLAGS+= -lidn -lidn2
 SUPPORT_PROXY=yes
 %if %{with dmarc}
-EXPERIMENTAL_DMARC=yes
+SUPPORT_DMARC=yes
 LOOKUP_LIBS+=-lopendmarc
 %endif
 %if %{with spf}
@@ -273,6 +272,7 @@ LOOKUP_LIBS+=-lldap -llber
 EXPERIMENTAL_LMDB=yes
 LOOKUP_LIBS+=-llmdb
 %endif
+DLOPEN_LOCAL_SCAN=yes
 EOF
 
 # have to be after Local/Makefile-Linux creation
@@ -280,7 +280,7 @@ cp -f src/EDITME Local/Makefile
 cp -f exim_monitor/EDITME Local/eximon.conf
 
 %build
-%{__make} -e -j1 \
+%{__make} -e \
 	FULLECHO=''
 
 %install
@@ -365,14 +365,13 @@ fi
 %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
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim
+%attr(754,root,root) /etc/cron.daily/exim.cron.db
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
 %attr(754,root,root) /etc/rc.d/init.d/exim
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim
 %attr(4755,root,root) %{_bindir}/exim
-%attr(770,root,exim) %dir %{_var}/spool/exim
-%attr(750,exim,exim) %dir %{_var}/spool/exim/db
-%attr(700,exim,root) %dir %{_var}/spool/exim/input
-%attr(750,exim,root) %dir %{_var}/spool/exim/msglog
 %attr(755,root,root) %{_bindir}/exim_*
 %attr(755,root,root) %{_bindir}/exinext
 %attr(755,root,root) %{_bindir}/exiwhat
@@ -391,12 +390,13 @@ fi
 %attr(755,root,root) %{_sbindir}/runq
 %attr(755,root,root) %{_sbindir}/sendmail
 %attr(755,root,root) /usr/lib/sendmail
-%attr(754,root,root) /etc/cron.daily/exim.cron.db
 %attr(750,exim,root) %dir %{_var}/log/exim
 %attr(750,exim,root) %dir %{_var}/log/archive/exim
 %attr(640,exim,root) %ghost %{_var}/log/exim/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp
+%attr(770,root,exim) %dir %{_var}/spool/exim
+%attr(750,exim,exim) %dir %{_var}/spool/exim/db
+%attr(700,exim,root) %dir %{_var}/spool/exim/input
+%attr(750,exim,root) %dir %{_var}/spool/exim/msglog
 %if %{with dynamic}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules
@@ -405,7 +405,14 @@ fi
 %{?with_sqlite:%attr(755,root,root) %{_libdir}/%{name}/modules/sqlite.so}
 %{?with_whoson:%attr(755,root,root) %{_libdir}/%{name}/modules/whoson.so}
 %endif
-%{_mandir}/man8/*
+%{_mandir}/man8/exicyclog.8*
+%{_mandir}/man8/exigrep.8*
+%{_mandir}/man8/exim.8*
+%{_mandir}/man8/exim_*.8*
+%{_mandir}/man8/eximstats.8*
+%{_mandir}/man8/exinext.8*
+%{_mandir}/man8/exiqsumm.8*
+%{_mandir}/man8/exiwhat.8*
 
 %files X11
 %defattr(644,root,root,755)
@@ -413,6 +420,7 @@ fi
 %attr(755,root,root) %{_bindir}/eximon.bin
 %{_desktopdir}/eximon.desktop
 %{_pixmapsdir}/eximon.png
+%{_mandir}/man8/eximon.8*
 
 %files devel
 %defattr(644,root,root,755)