X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.spec;h=b99034e2e09a58dc1d724cbea5f890190cc559e2;hb=ba0cf7d8a8efb3686cf0cda984e6988c280cdfda;hp=ad15d949895e02fcd58d2c06f85870c2bce2b5ef;hpb=e04f1fe1ef7328060b5c0036cc36c03c36892d3d;p=packages%2Fexim.git

diff --git a/exim.spec b/exim.spec
index ad15d94..b99034e 100644
--- a/exim.spec
+++ b/exim.spec
@@ -14,15 +14,15 @@ Summary:	University of Cambridge Mail Transfer Agent
 Summary(pl):	Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR):	Servidor de correio eletrônico exim
 Name:		exim
-Version:	4.60
-Release:	3
+Version:	4.61
+Release:	2
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-%{version}.tar.bz2
-# Source0-md5:	eed3c8fc393cf7ccc9c1079b28516128
+# Source0-md5:	f6bbf99a6f63c0f5045a1779e7e810c4
 Source1:	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-%{version}.tar.bz2
-# Source1-md5:	ba88e4814472be8de8deed36ec80877a
+# Source1-md5:	f86c26fda8871c72892b3ff586677310
 Source2:	%{name}.init
 Source3:	%{name}.cron.db
 Source4:	%{name}4.conf
@@ -43,27 +43,29 @@ Source15:	%{name}4-smtp.pamd
 Source16:	%{name}on.png
 Patch0:		%{name}4-EDITME.patch
 Patch1:		%{name}4-monitor-EDITME.patch
+Patch2:		%{name}4-cflags.patch
 Patch3:		%{name}4-use_system_pcre.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}-noloadbalance.patch
+Patch7:		%{name}-acl_negation.patch
 URL:		http://www.exim.org/
-BuildRequires:	XFree86-devel
+BuildRequires:	xorg-lib-libX11-devel
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
 BuildRequires:	db-devel
 %{?with_dkeys:BuildRequires:	libdomainkeys-devel >= 0.68}
 %{?with_spf:BuildRequires:	libspf2-devel >= 1.2.5-2}
 %{?with_srs:BuildRequires:	libsrs_alt-devel >= 1.0}
 %{?with_mysql:BuildRequires:	mysql-devel}
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.0.0}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 BuildRequires:	pcre-devel
 BuildRequires:	perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	texinfo >= 4.7
 %{?with_whoson:BuildRequires:	whoson-devel}
@@ -160,10 +162,12 @@ Pliki nag
 %setup -q -a1 -a7
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 install %{SOURCE13} doc/FAQ.txt.bz2
 install %{SOURCE14} doc/config.samples.tar.bz2
@@ -176,7 +180,7 @@ cp -f exim_monitor/EDITME Local/eximon.conf
 %{__make} -j1 \
 	%{?debug:FULLECHO=''} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes} %{?with_dkeys:-DEXPERIMENTAL_DOMAINKEYS=yes}" \
+	CUSTOM_CFLAGS="%{rpmcflags} %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes} %{?with_dkeys:-DEXPERIMENTAL_DOMAINKEYS=yes}" \
 	LOOKUP_CDB=yes \
 	XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \
 	X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \
@@ -245,14 +249,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 umask 022
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/exim ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	%banner %{name} -e <<EOF
-Run \"/etc/rc.d/init.d/%{name} start\" to start exim daemon.
-EOF
-# vim:"
-fi
+%service %{name} restart "exim daemon"
 
 if [ ! -f /etc/mail/mailname ]; then
 	rm -f /etc/mail/mailname && hostname -f > /etc/mail/mailname
@@ -262,9 +259,7 @@ newaliases
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/exim ]; then
-		/etc/rc.d/init.d/exim stop >&2
-	fi
+	%service exim stop
 	/sbin/chkconfig --del %{name}
 fi