SPECS: postfix.spec - pass CC correctly - re-add sasl and ssl/tls ...

[shadzik]

Author: shadzik                      Date: Mon Sep 10 09:32:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pass CC correctly
- re-add sasl and ssl/tls support
- properly link dicts so that really only them have *sql deps
- rel 3

---- Files affected:
SPECS:
   postfix.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.289 SPECS/postfix.spec:1.290
--- SPECS/postfix.spec:1.289	Sun Sep  9 10:35:43 2007
+++ SPECS/postfix.spec	Mon Sep 10 11:31:59 2007
@@ -25,7 +25,7 @@
 Name:		postfix
 Version:	2.3.12
 %define		vda_ver 2.3.3
-Release:	2
+Release:	3
 Epoch:		2
 License:	distributable
 Group:		Networking/Daemons
@@ -249,19 +249,18 @@
 %build
 %{__make} -f Makefile.init makefiles
 %{__make} tidy
+CC="%{__cc}"
+export CC
 %{__make} \
-	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} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
+	AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre"
 
 
-#	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" \
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security} \
@@ -480,6 +479,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2007/09/10 09:31:59  shadzik
+- pass CC correctly
+- re-add sasl and ssl/tls support
+- properly link dicts so that really only them have *sql deps
+- rel 3
+
 Revision 1.289  2007/09/09 08:35:43  glen
 - fixing no extra deps merged from AC-branch
 
================================================================

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