- readded wrongly removed hunks

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index 58cd5af636fc205f2ea112a9d686081f2ac782a3..fb5052b5faea0f56ed77ad5b1eee173b277760d2 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -1,6 +1,3 @@
-# TODO:
-# - check/fix 'polish' bcond
-# - add http://www.aurore.net/projects/postfix_memcached/
 #
 # Conditional build:
 %bcond_without ldap    # without LDAP map module
@@ -12,7 +9,6 @@
 %bcond_without vda     # with VDA patch
 %bcond_with    hir     # with Beeth's header_if_reject patch
 %bcond_with    tcp     # with unofficial tcp: lookup table
-#%bcond_with   polish  # with double English+Polish messages
 #
 Summary:       Postfix Mail Transport Agent
 Summary(cs.UTF-8):     Postfix - program pro přepravu pošty (MTA)
@@ -22,35 +18,33 @@ 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.3.12
-%define                vda_ver 2.3.3
-Release:       2
+Version:       2.4.5
+%define                vda_ver 2.4.5
+Release:       0.1
 Epoch:         2
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: 54aa9e61cc640d2515d965b30cf73e37
+# Source0-md5: ceba0cde05d12baa0ba2ed69fbb96b42
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
-Source7:       http://web.onda.com.br/nadal/postfix/VDA/%{name}-%{vda_ver}-vda.patch.gz
-# Source7-md5: 3506ab432360766b6a2708042b29943a
+Source7:       http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng.patch.gz
+# Source7-md5: 35fa62c93091d42ab02f67d0614d7086
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-conf_msg.patch
 Patch2:                %{name}-dynamicmaps.patch
 Patch3:                %{name}-master.cf_cyrus.patch
 # from http://akson.sgh.waw.pl/~chopin/unix/postfix-2.1.5-header_if_reject.diff
 Patch4:                %{name}-header_if_reject.patch
-#Patch5:       %{name}-pl.patch
-#Patch6:       %{name}-size-check-before-proxy.patch
-#Patch7:       %{name}-log-proxy-rejects.patch
-Patch8:                %{name}-ident.patch
-Patch9:                %{name}-lib64.patch
-Patch10:       %{name}-conf.patch
-Patch11:       %{name}-dictname.patch
+Patch5:                %{name}-log-proxy-rejects.patch
+Patch6:                %{name}-ident.patch
+Patch7:                %{name}-lib64.patch
+Patch8:                %{name}-conf.patch
+Patch9:                %{name}-dictname.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -225,21 +219,22 @@ postfix).
 %prep
 %setup -q
 %{?with_vda:zcat %{SOURCE7} | patch -p1 -s}
+
+find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
+
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
 %{?with_hir:%patch4 -p0}
-#%{?with_polish:%patch5 -p1}
-#%patch6 -p1
-#%patch7 -p1 --obsolete ?
-%patch8 -p1
+%patch5 -p1
+%patch6 -p1
 sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
 %if "%{_lib}" == "lib64"
-%patch9 -p1
+%patch7 -p1
 %endif
-%patch10 -p1
-%patch11 -p1
+%patch8 -p1
+%patch9 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
@@ -248,14 +243,17 @@ sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
 %build
 %{__make} -f Makefile.init makefiles
 %{__make} tidy
+CC="%{__cc}"
+export CC
 %{__make} \
        DEBUG="" \
        OPT="%{rpmcflags} -D_FILE_OFFSET_BITS=64" \
        %{!?with_ldap:LDAPSO=""} \
        %{!?with_mysql:MYSQLSO=""} \
        %{!?with_pgsql:PGSQLSO=""} \
-       CCARGS="%{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL -I/usr/include/postgresql} %{?with_ssl:-DUSE_TLS -I/usr/include/openssl} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
-       AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre %{?with_ldap:-lldap -llber} %{?with_pgsql:-lpq} %{?with_mysql:-lmysqlclient -lz}"
+       CCARGS="%{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
+       AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -352,6 +350,8 @@ fi
 %doc html *README COMPATIBILITY HISTORY LICENSE RELEASE_NOTES TLS_*
 %doc README_FILES/*README
 %doc examples/smtpd-policy
+%dir %{_sysconfdir}/mail
+%{_sysconfdir}/mail/bounce.cf.default
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/access
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/canonical
@@ -362,7 +362,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/virtual
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/header_checks
 #%ghost %{_sysconfdir}/mail/*.db
-%dir %{_sysconfdir}/mail
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/dynamicmaps.cf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/main.cf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/master.cf