X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostfix.git;a=blobdiff_plain;f=postfix.spec;h=0d87f9e01b973f712b9d705ba9401b0376184723;hp=46a3e21b56ce3d7202e4f709bbdecb16bfdff8a4;hb=refs%2Fheads%2FTLD-2018;hpb=5dc210e70d60223858a4ca80af9c3b37324ebf29

diff --git a/postfix.spec b/postfix.spec
index 46a3e21..0d87f9e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -17,13 +17,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.0.2
-Release:	4
+Version:	3.4.6
+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:	d1dc2c23011c222129db3d91aa4f312a
+# Source0-md5:	5aa930a8ce3cc6f82247dbd9f536380c
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
@@ -265,10 +265,10 @@ export CC
 	DEBUG="" \
 	OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
 	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} %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE}" \
-	%{?with_ldap:AUXLIBS_CDB="-lcdb"} \
+	%{?with_cdb:AUXLIBS_CDB="-lcdb"} \
 	%{?with_ldap:AUXLIBS_LDAP="-lldap -llber"} \
 	%{?with_mysql:AUXLIBS_MYSQL="-lmysqlclient"} \
-	%{?with_ldap:AUXLIBS_PCRE="-lpcre"} \
+	AUXLIBS_PCRE="-lpcre" \
 	%{?with_pgsql:AUXLIBS_PGSQL="-lpq"} \
 	%{?with_sqlite:AUXLIBS_SQLITE="-lsqlite3 -lpthread"} \
 	AUXLIBS="%{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto}"
@@ -282,7 +282,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
 	$RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \
 	$RPM_BUILD_ROOT%{_var}/lib/postfix
 
-%{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
+%{__rm} -f html/Makefile.in conf/{LICENSE,main.cf.default}
 
 install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
@@ -292,6 +292,9 @@ cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/mail
 sed -e's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix,' \
 	conf/main.cf > $RPM_BUILD_ROOT%{_sysconfdir}/mail/main.cf
 
+sed -e 's,${LIB_PREFIX},%{_libdir}/postfix/postfix-,g;s,${LIB_SUFFIX},.so,g' \
+	conf/dynamicmaps.cf > $RPM_BUILD_ROOT%{_sysconfdir}/mail/dynamicmaps.cf
+
 for f in dns global master util tls; do
 	cp -a lib/libpostfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
 	ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so
@@ -326,10 +329,10 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
 > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger
 
-%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
+%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
 
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-script,post-install}
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-script,postfix-tls-script,postfix-wrapper,post-install,postmulti-script}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -398,8 +401,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/main.cf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/master.cf
 %{_sysconfdir}/mail/postfix-files
-%{_sysconfdir}/mail/postfix-wrapper
-%{_sysconfdir}/mail/postmulti-script
 %attr(740,root,root) /etc/cron.daily/postfix
 %attr(754,root,root) /etc/rc.d/init.d/postfix
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postfix
@@ -427,6 +428,11 @@ fi
 %attr(755,root,root) /usr/lib/sendmail
 %dir %{_libdir}/postfix
 %attr(755,root,root) %{_libdir}/postfix/[!d]*
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-ldap.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-mysql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pcre.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pgsql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-sqlite.so
 %attr(755,root,root) %{_libdir}/postfix/discard
 %attr(755,root,root) %{_libdir}/postfix/dnsblog
 %attr(755,root,root) %dir %{_var}/spool/postfix
@@ -437,7 +443,7 @@ fi
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/deferred
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/incoming
 %attr(1730,postfix,maildrop) %dir %{_var}/spool/postfix/maildrop
-%attr(755,postfix,root) %dir %{_var}/spool/postfix/pid
+%attr(755,root,root) %dir %{_var}/spool/postfix/pid
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/private
 %attr(710,postfix,maildrop) %dir %{_var}/spool/postfix/public
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/saved