- readded wrongly removed hunks

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index b920eab45d0ce24c0c0a99065e528f39b19eee43..fb5052b5faea0f56ed77ad5b1eee173b277760d2 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - check/fix 'polish' bcond
 #
 # Conditional build:
 %bcond_without ldap    # without LDAP map module
@@ -11,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)
@@ -43,13 +40,11 @@ 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
@@ -232,16 +227,14 @@ find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
 %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
@@ -357,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
@@ -367,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