X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=postfix.spec;h=e7fce8f445ed56fc092e180de244d5114d892022;hb=821104f07112a45416a8409c13c83683c4b095d7;hp=69f098eb3c248d459d7149fef46d5178c8bdd991;hpb=3c3651e4bcc4a579dbabaf101945e5df7b435c79;p=packages%2Fpostfix.git

diff --git a/postfix.spec b/postfix.spec
index 69f098e..e7fce8f 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -1,6 +1,6 @@
 #
 # TODO:
-#	- update pl.patch
+#	- fix ipv6 patch against IPv4 RBLs
 #	- 0.0.0.0/0 is still being added to mynetworks if any ipv6/ip
 #	  tunnels are present
 #
@@ -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.16-2.0.15-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.9
-Release:	1
+Version:	2.0.15
+Release:	2
 Epoch:		2
 Group:		Networking/Daemons
 License:	distributable
 Source0:	ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
+# Source0-md5:	723c2b7f67016e0c19b0e1aa08dad246
 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:	6823c6645d64c80b63597db8b4a29d16
 Source7:	%{name}.sasl
 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
@@ -44,6 +47,7 @@ Patch4:		%{name}-master.cf_cyrus.patch
 Patch5:		%{name}-ipv6.patch
 Patch6:		%{name}-pl.patch
 Patch7:		%{name}-cdb_man.patch
+Patch8:         %{name}-ns-mx-acl.patch
 URL:		http://www.postfix.org/
 BuildRequires:	awk
 %{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
@@ -144,7 +148,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.
@@ -156,7 +160,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
@@ -169,7 +173,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.
@@ -181,7 +185,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.
@@ -193,7 +197,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.
@@ -213,6 +217,7 @@ patch -p1 -s <pfixtls-%{tls_ver}/pfixtls.diff
 %{!?_without_ipv6:%patch5 -p1}
 %{?_with_polish:%patch6 -p1}
 %{?_with_cdb:%patch7 -p1}
+%patch8 -p1
 %{?_with_cdb:sh dict_cdb.sh}
 
 %build
@@ -250,9 +255,9 @@ install include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 (cd man; tar cf - .) | (cd $RPM_BUILD_ROOT%{_mandir}; tar xf -)
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/postfix
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/postfix
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/postfix
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/postfix
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sasl/smtpd.conf
 install auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
 
@@ -356,10 +361,10 @@ mv -f /etc/mail/master.cf.rpmtmp /etc/mail/master.cf
 %attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mail/postfix-script
 %attr(755,root,root) %{_sysconfdir}/mail/post-install
 %{_sysconfdir}/mail/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 size mtime md5) /etc/sysconfig/postfix
-%{!?_without_sasl:%config(noreplace) %verify(not size mtime md5) /etc/sasl/smtpd.conf}
+%attr(740,root,root) %{_sysconfdir}/cron.daily/postfix
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/postfix
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/postfix
+%{!?_without_sasl:%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sasl/smtpd.conf}
 %attr(755,root,root) %{_libdir}/libpostfix-*.so.*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/s*