X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=66e317c7141162045aab48d3f17c76d1e70f75d8;hb=4ec4eeb4b1c95a7767a2a15a47db6ce3e49779bf;hp=5b5e0aa83852955fb0814bbefdeaf5423dba67c7;hpb=48f46dea4baf3314575524b48c5ccad839dcb1f9;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index 5b5e0aa..66e317c 100644
--- a/exim.spec
+++ b/exim.spec
@@ -14,15 +14,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.77
-Release:	4
+Version:	4.80.1
+Release:	12
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	5d746275f2cc85845567f9d5eb84a57a
+# Source0-md5:	1a95dc9f02834b1b7430403a75edf162
 Source1:	ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2
-# Source1-md5:	5af01cdfe2f938bbac5d7a65cb3a7290
+# Source1-md5:	a0974c2ed244faa27cb6bc1724880ed3
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -47,11 +47,11 @@ Patch2:		%{name}4-cflags.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:		%{name}-bug-1056.patch
+
 # http://sourceforge.net/projects/eximdsn/
 Patch7:		%{name}_463_dsn_1_3.patch
 Patch8:		%{name}-spam-timeout.patch
-Patch9:		%{name}-dkim.patch
+Patch9:		exim-bug-659.patch
 Patch10:	%{name}-force-sigalrm.patch
 Patch11:	%{name}-bug-1057.patch
 URL:		http://www.exim.org/
@@ -89,11 +89,12 @@ Requires(pre):	/usr/sbin/useradd
 Requires:	findutils
 Requires:	pam >= 0.79.0
 Requires:	rc-scripts
+Requires:	which
 Provides:	group(exim)
 Provides:	smtpdaemon
 Provides:	user(exim)
 Obsoletes:	smtpdaemon
-Conflicts:	logrotate < 3.8.0
+Conflicts:	logrotate < 3.8.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -164,10 +165,10 @@ Pliki nagłówkowe dla Exima.
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
+
 %patch7 -p1
 %patch8 -p1
-#%patch9 -p0
+%patch9 -p2
 %patch10 -p1
 %patch11 -p1
 
@@ -241,8 +242,8 @@ cp -f exim_monitor/EDITME Local/eximon.conf
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail
-install -d $RPM_BUILD_ROOT/etc/{cron.{daily,weekly},logrotate.d,rc.d/init.d,sysconfig,pam.d,security}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8,%{_prefix}/lib}
+install -d $RPM_BUILD_ROOT/etc/{cron.daily,logrotate.d,rc.d/init.d,sysconfig,pam.d,security}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8,/usr/lib}
 install -d $RPM_BUILD_ROOT%{_var}/{spool/exim/{db,input,msglog},log/{archive,}/exim,mail}
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
@@ -257,7 +258,7 @@ install build-Linux-*/eximon $RPM_BUILD_ROOT%{_bindir}
 %{?with_dynamic:install build-Linux-*/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/modules}
 
 install %{SOURCE5} .
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.weekly
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.daily
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install	%{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
@@ -267,7 +268,7 @@ install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
 install %{SOURCE15} $RPM_BUILD_ROOT/etc/pam.d/smtp
 
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/sendmail
-ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_prefix}/lib/sendmail
+ln -sf %{_bindir}/exim $RPM_BUILD_ROOT/usr/lib/sendmail
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/mailq
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/rsmtp
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/rmail
@@ -343,8 +344,8 @@ fi
 %attr(755,root,root) %{_sbindir}/rsmtp
 %attr(755,root,root) %{_sbindir}/runq
 %attr(755,root,root) %{_sbindir}/sendmail
-%attr(755,root,root) %{_prefix}/lib/sendmail
-%attr(754,root,root) /etc/cron.weekly/exim.cron.db
+%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/*