- up to 3.6.8

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index 94571cff62e629228782868fdebd2f8d1642bb94..f7466627b37bea6855020864891514564a979d08 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -30,13 +30,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:       3.5.6
+Version:       3.6.8
 Release:       1
 Epoch:         2
 License:       IBM Public License or Eclipse Public License v2.0
 Group:         Networking/Daemons/SMTP
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: c5819f40ffbe22bc785a30905b1f1c7a
+# Source0-md5: d39b4666910ea4e4aeadd09bb1e1d2c4
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -65,6 +65,7 @@ Patch8:               %{name}-dictname.patch
 
 Patch11:       %{name}-scache_clnt.patch
 Patch12:       format-security.patch
+Patch13:       glibc-2.34.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -72,7 +73,8 @@ BuildRequires:        db-devel
 BuildRequires: glibc-devel >= 6:2.3.4
 BuildRequires: libicu-devel
 BuildRequires: libnsl-devel
-%{?with_lmbd:BuildRequires:    lmdb-devel}
+BuildRequires: m4
+%{?with_lmdb:BuildRequires:    lmdb-devel}
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.0.12}
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7l}
@@ -299,14 +301,14 @@ cat %{SOURCE7} | %{__patch} -p1 -s
 cat %{SOURCE11} | %{__patch} -p1 -s
 %endif
 
-find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
+find -type f | xargs %{__sed} -i -e 's|/etc/postfix|/etc/mail|g'
 
 %patch0 -p1
 
 %patch3 -p1
 %{?with_hir:%patch4 -p0}
 
-sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
+%{__sed} -i -e '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
 %patch7 -p1
 %patch8 -p1
 
@@ -314,11 +316,14 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %if %{with vda}
 %patch12 -p1
 %endif
+%patch13 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
 %endif
 
+%{__sed} -i -e 's,/lib64\>,/%{_lib},' makedefs
+
 %build
 # export, as the same variables must be passed both to 'make makefiles' and 'make'
 export CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?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} %{?with_sqlite:-DHAS_SQLITE} %{?with_lmdb:-DHAS_LMDB} -LHAS_SDBM"
@@ -333,7 +338,8 @@ export AUXLIBS_SQLITE="%{?with_sqlite:-lsqlite3}"
 
 export CC="%{__cc}"
 %{__make} makefiles \
-       shared=yes dynamicmaps=yes \
+       shared=yes \
+       dynamicmaps=yes \
        daemon_directory="%{_libdir}/postfix" \
        shlib_directory="%{_libdir}/postfix" \
        manpage_directory="%{_mandir}"