- updated to 3.8.6

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index ee2cf8290ee57be4c59fec108957bc52b96ddfb2..78f6eb91776c7ede010ca7a9d15c0e831283473a 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -18,13 +18,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.8.0
+Version:       3.8.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: 73cce85d78a6bf0d5a0c326c23361ed1
+# Source0-md5: 6a04fb70afead55f6ca106dc87a3a9db
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -47,6 +47,7 @@ URL:          http://www.postfix.org/
 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}
@@ -338,7 +339,7 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
 > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger
 
-%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.{default,proto},master.cf.proto}
+%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{makedefs.out,main.cf.default}
 %{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{,TLS_}LICENSE
 
 %clean
@@ -391,43 +392,12 @@ if [ $1 -le 1 ]; then
 fi
 [ -f "/etc/postfix/main.cf" ] && sed -i -e 's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix/sbin,' /etc/postfix/main.cf 2>/dev/null || :
 
-%triggerun -- %{name} < 2:3.4.6-2
-if [ $1 -le 1 ]; then
-        exit 0
-fi
-[ -d /etc/postfix ] || mkdir /etc/postfix 2>/dev/null || :
-for f in /etc/mail/{access,aliases,body_checks,bounce.cf.*,canonical,dynamicmaps.cf,generic,header_checks,main.cf,master.cf,postfix-files,relocated,transport,virtual}; do
-       f=${f##*/}
-       [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
-done
-find /etc/postfix -type f 2>/dev/null | xargs sed -i -e 's|/etc/mail|/etc/postfix|g' 2>/dev/null
-for f in /etc/mail/*.db; do
-       f=${f##*/}
-       [ "$f" = "*.db" ] && break
-       [ -f "/etc/mail/$f" ] && rm "/etc/mail/$f" 2>/dev/null || :
-       f=${f%%.db}
-       [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" /etc/postfix 2>/dev/null || :
-       if [ "$f" = "aliases" ]; then
-               /usr/sbin/postalias "/etc/postfix/aliases" 2>/dev/null || :
-       else
-               /usr/sbin/postmap "/etc/postfix/$f" 2>/dev/null || :
-       fi
-done
-[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 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
 
-%triggerpostun -- %{name} < 2:3.4.6-2
-echo
-echo "Warning! Configuration has been migrated to /etc/postfix."
-echo "It may be required to move some files manually from /etc/mail"
-echo "to /etc/postfix and/or run postmap on some files in /etc/postfix."
-echo
-
 %files
 %defattr(644,root,root,755)
 %doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_*
@@ -449,7 +419,9 @@ echo
 #%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