- release 2: updated tls patch

[packages/postfix.git] / postfix.spec

diff --git a/postfix.spec b/postfix.spec
index 90d0358a3a8d4c5b53078e50f5511367c7cd0e60..9e83344c46dd6d7f836b60c86f9cd9c05eb9ebe2 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -14,7 +14,7 @@
 # _with_polish         - with double English+Polish messages
 # _with_cdb            - tinycdb mapfile support
 #
-%define        tls_ver 0.8.13-2.0.6-0.9.7a
+%define        tls_ver 0.8.15-2.0.13-0.9.7b
 Summary:       Postfix Mail Transport Agent
 Summary(cs):   Postfix - program pro pøepravu po¹ty (MTA)
 Summary(es):   Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -23,19 +23,22 @@ Summary(pl):        Serwer SMTP Postfix
 Summary(pt_BR):        Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk):   Agent prenosu po¹ty Postfix
 Name:          postfix
-Version:       2.0.7
-Release:       0.2
+Version:       2.0.13
+Release:       2
 Epoch:         2
 Group:         Networking/Daemons
 License:       distributable
 Source0:       ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
+# Source0-md5: f4f2b4b930a7a32b1df475d87143269f
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
 Source5:       %{name}.sysconfig
 Source6:       ftp://ftp.aet.tu-cottbus.de/pub/pfixtls/pfixtls-%{tls_ver}.tar.gz
+# Source6-md5: 298f55e2d896a0240f5913a3b611e623
 Source7:       %{name}.sasl
-%{?_with_cdb:Source8:ftp://ftp.corpit.ru/pub/postfix/postfix-dict_cdb-1.1.11-20021104.tar.gz}
+Source8:       ftp://ftp.corpit.ru/pub/postfix/%{name}-dict_cdb-1.1.11-20021104.tar.gz
+# Source8-md5: 5731b5081725f4688dc6fae119d617e4
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-conf_msg.patch
 Patch2:                %{name}-dynamicmaps.patch
@@ -43,6 +46,7 @@ Patch3:               %{name}-pgsql.patch
 Patch4:                %{name}-master.cf_cyrus.patch
 Patch5:                %{name}-ipv6.patch
 Patch6:                %{name}-pl.patch
+Patch7:                %{name}-cdb_man.patch
 URL:           http://www.postfix.org/
 BuildRequires: awk
 %{!?_without_sasl:BuildRequires:       cyrus-sasl-devel}
@@ -51,7 +55,7 @@ BuildRequires:        grep
 %{!?_without_ipv6:BuildRequires:       libinet6 >= 0.20030228-1}
 %{!?_without_mysql:BuildRequires:      mysql-devel}
 %{!?_without_ldap:BuildRequires:       openldap-devel >= 2.0.0}
-%{!?_without_ssl:BuildRequires:                openssl-devel >= 0.9.7a}
+%{!?_without_ssl:BuildRequires:                openssl-devel >= 0.9.7b}
 BuildRequires: pcre-devel
 %{!?_without_pgsql:BuildRequires:      postgresql-devel}
 %{?_with_cdb:BuildRequires:            tinycdb-devel}
@@ -80,6 +84,7 @@ Obsoletes:    smail
 Obsoletes:     zmailer
 Requires:      diffutils
 Requires:      findutils
+%{?_with_cdb:Requires:tinycdb}
 
 %description
 Postfix is attempt to provide an alternative to the widely-used
@@ -119,8 +124,7 @@ configurazione di questo programma.
 Postfix jest prób± dostarczenia alternatywnego MTA w stosunku do
 szeroko u¿ywanego sendmaila. Postfix w zamierzeniu ma byæ szybki,
 ³atwy w administrowaniu, bezpieczny oraz ma byæ na tyle kompatybilny z
-sendmailem by nie denerwowaæ Twoich u¿ytkowników. %{!?_without_ipv6:Ta wersja wspiera
-IPv6.}
+sendmailem by nie denerwowaæ Twoich u¿ytkowników. %{!?_without_ipv6:Ta wersja wspiera IPv6.}
 
 %description -l pt_BR
 O Postfix é uma alternativa para o mundialmente utilizado sendmail. Se
@@ -143,7 +147,7 @@ pop
 Summary:       Postfix loadable modules development package
 Summary(pl):   Pakiet dla programistów ³adowanych modu³ów do postfiksa
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description devel
 Header files to build additional map types for Postfix.
@@ -155,7 +159,7 @@ Pliki nag
 Summary:       LDAP map support for Postfix
 Summary(pl):   Obs³uga map LDAP dla Postfiksa
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 Requires:      openldap >= 2.0.0
 
 %description dict-ldap
@@ -168,7 +172,7 @@ Ten pakiet dodaje obs
 Summary:       MySQL map support for Postfix
 Summary(pl):   Obs³uga map MySQL dla Postfiksa
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description dict-mysql
 This package provides support for MySQL maps in Postfix.
@@ -180,7 +184,7 @@ Ten pakiet dodaje obs
 Summary:       PCRE map support for Postfix
 Summary(pl):   Obs³uga map PCRE dla Postfiksa
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description dict-pcre
 This package provides support for PCRE maps in Postfix.
@@ -192,7 +196,7 @@ Ten pakiet dodaje obs
 Summary:       PostgreSQL map support for Postfix
 Summary(pl):   Obs³uga map PostgreSQL dla Postfiksa
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description dict-pgsql
 This package provides support for PostgreSQL maps in Postfix.
@@ -201,7 +205,7 @@ This package provides support for PostgreSQL maps in Postfix.
 Ten pakiet dodaje obs³ugê map PostgreSQL do Postfiksa.
 
 %prep
-%setup -q -a6 -a8
+%setup -q -a6 %{?_with_cdb:-a8}
 echo Postfix TLS patch:
 patch -p1 -s <pfixtls-%{tls_ver}/pfixtls.diff
 %patch0 -p1
@@ -211,6 +215,7 @@ patch -p1 -s <pfixtls-%{tls_ver}/pfixtls.diff
 %patch4 -p1
 %{!?_without_ipv6:%patch5 -p1}
 %{?_with_polish:%patch6 -p1}
+%{?_with_cdb:%patch7 -p1}
 %{?_with_cdb:sh dict_cdb.sh}
 
 %build