X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostfix.git;a=blobdiff_plain;f=postfix.spec;h=4162b41a522706308d9f3dd29dd7be906f0c460b;hp=ad556eb4573785fa8582619c534433ba160e0239;hb=HEAD;hpb=8e6b9a841b88026778b603eeef3a7051003dc02e

diff --git a/postfix.spec b/postfix.spec
index ad556eb..10673e5 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -7,8 +7,7 @@
 %bcond_without	sasl	# without SMTP AUTH support
 %bcond_without	ssl	# without SSL/TLS support
 %bcond_without	cdb	# without cdb map support
-%bcond_with	hir	# with Beeth's header_if_reject patch
-%bcond_with	tcp	# with unofficial tcp: lookup table
+%bcond_without	lmdb	# lmdb map suppor
 %bcond_without	epoll	# disable epoll for 2.4 kernels
 
 Summary:	Postfix Mail Transport Agent
@@ -19,42 +18,37 @@ 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.11.5
+Version:	3.9.0
 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:	8523f6d1de6f522313207524d794ee9c
+# Source0-md5:	3eda9b945ed6cdf11ef58a731c574a04
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}.sasl
 Source6:	%{name}.pamd
-Source8:	%{name}-bounce.cf.pl
+Source7:	%{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
-Source9:	%{name}-bounce.cf.de
-Source10:	%{name}.monitrc
+Source8:	%{name}-bounce.cf.de
+Source9:	%{name}.monitrc
 # -ource11-md5:	d46103195b43ec5784ea2c166b238f71
 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}-ident.patch
-Patch6:		%{name}-lib64.patch
-Patch7:		%{name}-conf.patch
-Patch8:		%{name}-dictname.patch
-Patch9:		%{name}-make-jN.patch
-Patch10:	%{name}-link.patch
-Patch11:	%{name}-scache_clnt.patch
+Patch2:		%{name}-master.cf_cyrus.patch
+Patch3:		%{name}-conf.patch
+Patch4:		%{name}-link.patch
+Patch5:		%{name}-scache_clnt.patch
 URL:		http://www.postfix.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	db-devel
 # getifaddrs() with IPv6 support
 BuildRequires:	glibc-devel >= 6:2.3.4
+%{?with_lmdb:BuildRequires:	lmdb-devel}
+BuildRequires:	libnsl-devel >= 1.3.0
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.0.12}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7l}
@@ -154,6 +148,18 @@ Header files to build additional map types for Postfix.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe do tworzenia dodatkowych typów map dla Postfiksa.
 
+%package dict-cdb
+Summary:	CDB map support for Postfix
+Summary(pl.UTF-8):	Obsługa map CDB dla Postfiksa
+Group:		Networking/Daemons/SMTP
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dict-cdb
+This package provides support for CDB maps in Postfix.
+
+%description dict-cdb -l pl.UTF-8
+Ten pakiet dodaje obsługę map CDB do Postfiksa.
+
 %package dict-ldap
 Summary:	LDAP map support for Postfix
 Summary(pl.UTF-8):	Obsługa map LDAP dla Postfiksa
@@ -167,6 +173,18 @@ This package provides support for LDAP maps in Postfix.
 %description dict-ldap -l pl.UTF-8
 Ten pakiet dodaje obsługę map LDAP do Postfiksa.
 
+%package dict-lmdb
+Summary:	LMDB map support for Postfix
+Summary(pl.UTF-8):	Obsługa map LMDB dla Postfiksa
+Group:		Networking/Daemons/SMTP
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dict-lmdb
+This package provides support for LMDB maps in Postfix.
+
+%description dict-lmdb -l pl.UTF-8
+Ten pakiet dodaje obsługę map LMDB do Postfiksa.
+
 %package dict-mysql
 Summary:	MySQL map support for Postfix
 Summary(pl.UTF-8):	Obsługa map MySQL dla Postfiksa
@@ -251,98 +269,78 @@ Plik monitrc do monitorowania serwera Postfix.
 
 %prep
 %setup -q
-
-find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
-
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
+sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
 %patch3 -p1
-%{?with_hir:%patch4 -p0}
+%patch4 -p1
 %patch5 -p1
-sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
-%if "%{_lib}" == "lib64"
-%patch6 -p1
-%endif
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-%if %{with tcp}
-sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
-%endif
 
 %build
-%{__make} -f Makefile.init makefiles
-%{__make} tidy
-CC="%{__cc}"
-export CC
-%{__make} \
-	DEBUG="" \
-	OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
-	%{!?with_ldap:LDAPSO=""} \
-	%{!?with_mysql:MYSQLSO=""} \
-	%{!?with_pgsql:PGSQLSO=""} \
-	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}" \
-	AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre"
+# 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"
+export AUXLIBS="%{rpmldflags} -lsasl -lssl -lcrypto"
+export AUXLIBS_CDB="%{?with_cdb:-lcdb}"
+export AUXLIBS_LDAP="%{?with_ldap:-lldap -llber}"
+export AUXLIBS_LMDB="%{?with_lmdb:-llmdb}"
+export AUXLIBS_MYSQL="%{?with_mysql:-lmysqlclient}"
+export AUXLIBS_PCRE="-lpcre"
+export AUXLIBS_PGSQL="%{?with_pgsql:-lpq}"
+export AUXLIBS_SQLITE="%{?with_sqlite:-lsqlite3}"
+
+export CC="%{__cc}"
+%{__make} makefiles \
+    shared=yes \
+    dynamicmaps=yes \
+    daemon_directory="%{_libdir}/postfix/sbin" \
+    shlib_directory="%{_libdir}/postfix" \
+    manpage_directory="%{_mandir}"
+
+%{__make} -j1 \
+    DEBUG="" \
+    OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,monit} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{mail,sasl} \
-	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix,/usr/lib}\
+	$RPM_BUILD_ROOT%{_sysconfdir}/{postfix,sasl} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix/sbin,/usr/lib}\
 	$RPM_BUILD_ROOT{%{_includedir}/postfix,%{_mandir}} \
 	$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}
-
-install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
-install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
-ln $RPM_BUILD_ROOT%{_libdir}/postfix/smtp $RPM_BUILD_ROOT%{_libdir}/postfix/lmtp
-ln $RPM_BUILD_ROOT%{_libdir}/postfix/qmgr $RPM_BUILD_ROOT%{_libdir}/postfix/nqmgr
-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
-
-for f in dns global master util ; do
-	cp -a lib/lib${f}.a $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
-	ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so
-done
-install -p lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
-cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
+%{__make} non-interactive-package \
+	install_root=$RPM_BUILD_ROOT
 
-cp -a man/man* $RPM_BUILD_ROOT%{_mandir}
+cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/aliases
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/postfix
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sasl/smtpd.conf
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/smtp
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
-cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
-cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/bounce.cf.pl
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/bounce.cf.de
+cp -a %{SOURCE9} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
 install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
 install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
+install -p man/man1/qshape.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/mailq
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/newaliases
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/\
+touch $RPM_BUILD_ROOT%{_sysconfdir}/postfix/\
 	{aliases,access,canonical,relocated,transport,virtual}{,.db}
 
 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} $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-files,postfix-script,post-install}
+%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.default}
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{,TLS_}LICENSE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -354,14 +352,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-if ! grep -q "^postmaster:" %{_sysconfdir}/mail/aliases; then
-	echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
-	echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
+if ! grep -q "^postmaster:" %{_sysconfdir}/postfix/aliases; then
+	echo "Adding Entry for postmaster in %{_sysconfdir}/postfix/aliases" >&2
+	echo "postmaster: root" >>%{_sysconfdir}/postfix/aliases
 fi
 if [ "$1" = "1" ]; then
 	# only on installation, not upgrade; set sane defaults
 	# postfix expects gethostname() to return FQDN, which is obviously wrong
-	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
+	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/postfix/main.cf; then
 		domain=$(/bin/hostname -d 2>/dev/null)
 		[ -n "$domain" -a "$domain" != 'localdomain' ] && \
 			postconf -e mydomain="$domain"
@@ -388,59 +386,107 @@ if [ "$1" = "0" ]; then
 	%groupremove postfix
 fi
 
+%triggerun -- %{name} < 2:3.8.0-1
+if [ $1 -le 1 ]; then
+        exit 0
+fi
+[ -f "/etc/postfix/main.cf" ] && sed -i -e 's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix/sbin,' /etc/postfix/main.cf 2>/dev/null || :
+
+%triggerpostun -- %{name} < 2:3.8.0-1
+echo
+echo "Warning! Option daemon_directory in file /etc/postfix/main.cf was set to"
+echo "path %{_libdir}/postfix/sbin."
+echo
+
 %files
 %defattr(644,root,root,755)
 %doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_*
 %doc README_FILES/*README
 %doc examples/smtpd-policy
-%dir %{_sysconfdir}/mail
-%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/bounce.cf.default
-%lang(de) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.de
-%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.pl
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/canonical
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/generic
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/regexp_table
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/relocated
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/transport
-%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
-%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
-%{_sysconfdir}/mail/postfix-wrapper
-%{_sysconfdir}/mail/postmulti-script
+%dir %{_sysconfdir}/postfix
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/access
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/aliases
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.default
+%lang(de) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.de
+%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.pl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/canonical
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/generic
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/regexp_table
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/relocated
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/transport
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/virtual
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/header_checks
+#%ghost %{_sysconfdir}/postfix/*.db
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/dynamicmaps.cf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/main.cf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/main.cf.proto
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/master.cf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/master.cf.proto
+%{_sysconfdir}/postfix/postfix-files
 %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
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp
 %{?with_sasl:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sasl/smtpd.conf}
-%attr(755,root,root) %{_libdir}/libpostfix-*.so.*
 %attr(755,root,root) %{_bindir}/mailq
 %attr(755,root,root) %{_bindir}/newaliases
 %attr(755,root,root) %{_bindir}/rmail
-%attr(755,root,root) %{_sbindir}/s*
-%attr(755,root,root) %{_sbindir}/postfix
 %attr(755,root,root) %{_sbindir}/postalias
+%attr(755,root,root) %{_sbindir}/postcat
+%attr(755,root,root) %{_sbindir}/postconf
 %attr(2755,root,maildrop) %{_sbindir}/postdrop
+%attr(755,root,root) %{_sbindir}/postfix
 %attr(755,root,root) %{_sbindir}/postkick
-%attr(755,root,root) %{_sbindir}/postl*
-%attr(755,root,root) %{_sbindir}/postc*
+%attr(755,root,root) %{_sbindir}/postlock
+%attr(755,root,root) %{_sbindir}/postlog
 %attr(755,root,root) %{_sbindir}/postmap
 %attr(755,root,root) %{_sbindir}/postmulti
 %attr(2755,root,maildrop) %{_sbindir}/postqueue
 %attr(755,root,root) %{_sbindir}/postsuper
-%attr(755,root,root) %{_sbindir}/posttls-finger
-%attr(755,root,root) %{_sbindir}/qmqp-sink
-%attr(755,root,root) %{_sbindir}/qmqp-source
+%attr(755,root,root) %{_sbindir}/sendmail
 %attr(755,root,root) /usr/lib/sendmail
 %dir %{_libdir}/postfix
-%attr(755,root,root) %{_libdir}/postfix/[!d]*
-%attr(755,root,root) %{_libdir}/postfix/discard
-%attr(755,root,root) %{_libdir}/postfix/dnsblog
+%attr(755,root,root) %{_libdir}/postfix/libpostfix-dns.so
+%attr(755,root,root) %{_libdir}/postfix/libpostfix-global.so
+%attr(755,root,root) %{_libdir}/postfix/libpostfix-master.so
+%attr(755,root,root) %{_libdir}/postfix/libpostfix-tls.so
+%attr(755,root,root) %{_libdir}/postfix/libpostfix-util.so
+%dir %{_libdir}/postfix/sbin
+%attr(755,root,root) %{_libdir}/postfix/sbin/anvil
+%attr(755,root,root) %{_libdir}/postfix/sbin/bounce
+%attr(755,root,root) %{_libdir}/postfix/sbin/cleanup
+%attr(755,root,root) %{_libdir}/postfix/sbin/discard
+%attr(755,root,root) %{_libdir}/postfix/sbin/dnsblog
+%attr(755,root,root) %{_libdir}/postfix/sbin/error
+%attr(755,root,root) %{_libdir}/postfix/sbin/flush
+%attr(755,root,root) %{_libdir}/postfix/sbin/lmtp
+%attr(755,root,root) %{_libdir}/postfix/sbin/local
+%attr(755,root,root) %{_libdir}/postfix/sbin/master
+%attr(755,root,root) %{_libdir}/postfix/sbin/nqmgr
+%attr(755,root,root) %{_libdir}/postfix/sbin/oqmgr
+%attr(755,root,root) %{_libdir}/postfix/sbin/pickup
+%attr(755,root,root) %{_libdir}/postfix/sbin/pipe
+%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-script
+%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-tls-script
+%attr(755,root,root) %{_libdir}/postfix/sbin/postfix-wrapper
+%attr(755,root,root) %{_libdir}/postfix/sbin/post-install
+%attr(755,root,root) %{_libdir}/postfix/sbin/postlogd
+%attr(755,root,root) %{_libdir}/postfix/sbin/postmulti-script
+%attr(755,root,root) %{_libdir}/postfix/sbin/postscreen
+%attr(755,root,root) %{_libdir}/postfix/sbin/proxymap
+%attr(755,root,root) %{_libdir}/postfix/sbin/qmgr
+%attr(755,root,root) %{_libdir}/postfix/sbin/qmqpd
+%attr(755,root,root) %{_libdir}/postfix/sbin/scache
+%attr(755,root,root) %{_libdir}/postfix/sbin/showq
+%attr(755,root,root) %{_libdir}/postfix/sbin/smtp
+%attr(755,root,root) %{_libdir}/postfix/sbin/smtpd
+%attr(755,root,root) %{_libdir}/postfix/sbin/spawn
+%attr(755,root,root) %{_libdir}/postfix/sbin/tlsmgr
+%attr(755,root,root) %{_libdir}/postfix/sbin/tlsproxy
+%attr(755,root,root) %{_libdir}/postfix/sbin/trivial-rewrite
+%attr(755,root,root) %{_libdir}/postfix/sbin/verify
+%attr(755,root,root) %{_libdir}/postfix/sbin/virtual
 %attr(755,root,root) %dir %{_var}/spool/postfix
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/active
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/bounce
@@ -449,7 +495,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
@@ -458,9 +504,7 @@ fi
 %{_mandir}/man1/mailq.1*
 %{_mandir}/man1/newaliases.1*
 %{_mandir}/man1/post*.1*
-%{_mandir}/man1/qmqp-*.1*
 %{_mandir}/man1/sendmail.1*
-%{_mandir}/man1/smtp-*.1*
 %{_mandir}/man5/access.5*
 %{_mandir}/man5/aliases.5*
 %{_mandir}/man5/body_checks.5*
@@ -485,40 +529,50 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpostfix-*.so
 %{_includedir}/postfix
 
+%if %{with cdb}
+%files dict-cdb
+%attr(755,root,root) %{_libdir}/postfix/postfix-cdb.so
+%endif
+
 %if %{with ldap}
 %files dict-ldap
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_ldap.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-ldap.so
 %{_mandir}/man5/ldap_table.5*
 %endif
 
+%if %{with lmdb}
+%files dict-lmdb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/postfix-lmdb.so
+%{_mandir}/man5/lmdb_table.5*
+%endif
+
 %if %{with mysql}
 %files dict-mysql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_mysql.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-mysql.so
 %{_mandir}/man5/mysql_table.5*
 %endif
 
 %files dict-pcre
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_pcre.so
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/pcre_table
+%attr(755,root,root) %{_libdir}/postfix/postfix-pcre.so
 %{_mandir}/man5/pcre_table.5*
 
 %if %{with pgsql}
 %files dict-pgsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_pgsql.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-pgsql.so
 %{_mandir}/man5/pgsql_table.5*
 %endif
 
 %if %{with sqlite}
 %files dict-sqlite
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_sqlite.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-sqlite.so
 %{_mandir}/man5/sqlite_table.5*
 %endif