SPECS (AC-branch): postfix.spec - reverted bogus 1.282.2.9 and 1.2...

[gotar]

Author: gotar                        Date: Mon Sep 10 01:10:22 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- reverted bogus 1.282.2.9 and 1.282.2.11 - you've disabled TLS and SASL
  in stable line you m*r*n... :( please fix it on HEAD too
- added bounce.cf.default as template for bounce_template_file
- STBR ASAP

---- Files affected:
SPECS:
   postfix.spec (1.282.2.13 -> 1.282.2.14) 

---- Diffs:

================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.282.2.13 SPECS/postfix.spec:1.282.2.14
--- SPECS/postfix.spec:1.282.2.13	Sun Sep  9 16:28:03 2007
+++ SPECS/postfix.spec	Mon Sep 10 03:10:17 2007
@@ -10,7 +10,7 @@
 %bcond_without	sasl	# without SMTP AUTH support
 %bcond_without	ssl	# without SSL/TLS support
 %bcond_without	cdb	# without cdb map support
-%bcond_without	vda	# with VDA patch
+%bcond_without	vda	# without 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
@@ -25,7 +25,7 @@
 Name:		postfix
 Version:	2.3.12
 %define		vda_ver 2.3.7
-Release:	4
+Release:	5
 Epoch:		2
 License:	distributable
 Group:		Networking/Daemons
@@ -250,17 +250,13 @@
 %{__make} -f Makefile.init makefiles
 %{__make} tidy
 %{__make} -j1 \
-	CC="%{__cc}" \
 	DEBUG="" \
 	OPT="%{rpmcflags} -D_FILE_OFFSET_BITS=64" \
 	%{!?with_ldap:LDAPSO=""} \
 	%{!?with_mysql:MYSQLSO=""} \
 	%{!?with_pgsql:PGSQLSO=""} \
-	CCARGS=""
-#	AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre %{?with_ldap:-lldap -llber} %{?with_pgsql:-lpq} %{?with_mysql:-lmysqlclient -lz}"
-
-
-#	CCARGS="%{?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 -I/usr/include/postgresql} %{?with_ssl:-DUSE_TLS -I/usr/include/openssl} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
+	CCARGS="%{?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 -I/usr/include/postgresql} %{?with_ssl:-DUSE_TLS -I/usr/include/openssl} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
+	AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre %{?with_ldap:-lldap -llber} %{?with_pgsql:-lpq} %{?with_mysql:-lmysqlclient -lz}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -359,6 +355,7 @@
 %doc examples/smtpd-policy
 %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
 %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
@@ -480,6 +477,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282.2.14  2007/09/10 01:10:17  gotar
+- reverted bogus 1.282.2.9 and 1.282.2.11 - you've disabled TLS and SASL
+  in stable line you m*r*n... :( please fix it on HEAD too
+- added bounce.cf.default as template for bounce_template_file
+- STBR ASAP
+
 Revision 1.282.2.13  2007/09/09 14:28:03  glen
 - make -j1 as otherwise dicts are built before the libs they depend on
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postfix.spec?r1=1.282.2.13&r2=1.282.2.14&f=u