SPECS: postfix.spec - prepare bconds for ac

[glen]

Author: glen                         Date: Mon Aug 18 12:43:21 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- prepare bconds for ac

---- Files affected:
SPECS:
   postfix.spec (1.318 -> 1.319) 

---- Diffs:

================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.318 SPECS/postfix.spec:1.319
--- SPECS/postfix.spec:1.318	Tue Jul  8 16:46:16 2008
+++ SPECS/postfix.spec	Mon Aug 18 14:43:16 2008
@@ -7,14 +7,18 @@
 %bcond_without	sasl	# without SMTP AUTH support
 %bcond_without	ssl	# without SSL/TLS support
 %bcond_without	cdb	# without cdb map support
-%if "%{pld_release}" == "ti"
-%bcond_with	vda	# without VDA patch
-%else
+%if "%{pld_release}" == "th"
 %bcond_without	vda	# without VDA patch
+%else
+%bcond_with	vda	# with VDA patch
 %endif
 %bcond_with	hir	# with Beeth's header_if_reject patch
 %bcond_with	tcp	# with unofficial tcp: lookup table
+%if "%{pld_release}" == "ac"
+%bcond_with		epoll	# enable epoll for 2.6 kernels
+%else
 %bcond_without	epoll	# disable epoll for 2.4 kernels
+%endif
 #
 %define		vda_ver 2.5.1
 Summary:	Postfix Mail Transport Agent
@@ -344,16 +348,16 @@
 %post
 /sbin/ldconfig
 if ! grep -q "^postmaster:" %{_sysconfdir}/mail/aliases; then
-echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
-echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
+	echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
+	echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
 fi
 if [ "$1" -gt "1" ]; then
-	postfix upgrade-configuration
+	%{_sbindir}/postfix upgrade-configuration
 fi
 
-newaliases
+%{_sbindir}/newaliases
 /sbin/chkconfig --add postfix
-%service postfix restart "postfix daemon"
+%service postfix restart "Postfix Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -505,8 +509,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.319  2008/08/18 12:43:16  glen
+- prepare bconds for ac
+
 Revision 1.318  2008/07/08 14:46:16  glen
-- update to 2.5.2 (by Eero Hänninen)
+- update to 2.5.2 (by Eero Hänninen)
 
 Revision 1.317  2008/06/12 19:42:42  arekm
 - rel 7
@@ -527,7 +534,7 @@
 - enable epoll on HEAD
 
 Revision 1.311  2008-03-28 16:21:14  glen
-- updates by Eero Hanninen <eero.hanninen at delfi.ee>; rel 5.1 (give it a test!)
+- updates by Eero Hänninen <eero.hanninen at delfi.ee>; rel 5.1 (give it a test!)
 
 Revision 1.310  2008-03-27 13:42:52  glen
 - release notes say ldap 2.0.12 only needed
================================================================

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