- up to 2.8.9

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index 75bdeccc733dd9ef2a1e53c960917b9156c0cf3e..3097fe0d701a92c09dcb08983f7479e807f57c48 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -24,7 +24,7 @@
 %bcond_without epoll   # disable epoll for 2.4 kernels
 %endif
 
-%define                vda_ver v10-2.8.1
+%define                vda_ver v10-2.8.5
 Summary:       Postfix Mail Transport Agent
 Summary(cs.UTF-8):     Postfix - program pro přepravu pošty (MTA)
 Summary(es.UTF-8):     Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -33,13 +33,13 @@ Summary(pl.UTF-8):  Serwer SMTP Postfix
 Summary(pt_BR.UTF-8):  Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):     Agent prenosu pošty Postfix
 Name:          postfix
-Version:       2.8.4
+Version:       2.8.9
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: a9fdd0f204e7ca0b7d32fd0b9f8f8c72
+# Source0-md5: 512e2d13da6d25ba64fdf3a1c62190a1
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -47,7 +47,7 @@ Source4:      %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
 Source7:       http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5: 5d5156e51cc07057bf347bbb34934d3e
+# Source7-md5: 3292f2ec7c9fb8957f88d8783252d1f8
 Source8:       %{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
 Source9:       %{name}-bounce.cf.de
@@ -303,7 +303,7 @@ CC="%{__cc}"
 export CC
 %{__make} \
        DEBUG="" \
-       OPT="%{rpmcflags} -D_FILE_OFFSET_BITS=64" \
+       OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
        %{!?with_ldap:LDAPSO=""} \
        %{!?with_mysql:MYSQLSO=""} \
        %{!?with_pgsql:PGSQLSO=""} \
@@ -384,7 +384,7 @@ if [ "$1" = "1" ]; then
        # postfix expects gethostname() to return FQDN, which is obviously wrong
        if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
                domain=$(/bin/hostname -d 2>/dev/null)
-               [ "$domain" != 'localdomain' ] && \
+               [ -n "$domain" -a "$domain" != 'localdomain' ] && \
                        postconf -e mydomain="$domain"
        fi
 else