- rel 2; fix negation in ACLs

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 1f2e4115acccb33f1794e671493365cec5eb96a8..b99034e2e09a58dc1d724cbea5f890190cc559e2 100644 (file)
--- 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:       5
+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
@@ -49,8 +49,9 @@ 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}
@@ -64,7 +65,7 @@ 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}
@@ -166,6 +167,7 @@ Pliki nag
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 install %{SOURCE13} doc/FAQ.txt.bz2
 install %{SOURCE14} doc/config.samples.tar.bz2
@@ -247,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
@@ -264,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