From 8eb680c0dec31137f195500e44b61031ee09893e Mon Sep 17 00:00:00 2001 From: shadzik Date: Mon, 10 Sep 2007 09:31:59 +0000 Subject: [PATCH] - pass CC correctly - re-add sasl and ssl/tls support - properly link dicts so that really only them have *sql deps - rel 3 Changed files: postfix.spec -> 1.290 --- postfix.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/postfix.spec b/postfix.spec index 6b6a382..6158e06 100644 --- a/postfix.spec +++ b/postfix.spec @@ -24,7 +24,7 @@ Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix Version: 2.3.12 %define vda_ver 2.3.3 -Release: 2 +Release: 3 Epoch: 2 License: distributable Group: Networking/Daemons @@ -248,19 +248,18 @@ sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c %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} \ -- 2.44.0