SPECS (AC-branch): postfix.spec - it startups fine without implici...

[glen]

Author: glen                         Date: Tue Dec 11 16:23:21 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- it startups fine without implicit myhostname in main.cf; rel 2

---- Files affected:
SPECS:
   postfix.spec (1.282.2.23 -> 1.282.2.24) 

---- Diffs:

================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.282.2.23 SPECS/postfix.spec:1.282.2.24
--- SPECS/postfix.spec:1.282.2.23	Tue Nov 27 13:55:59 2007
+++ SPECS/postfix.spec	Tue Dec 11 17:23:15 2007
@@ -15,6 +15,7 @@
 %bcond_with	tcp	# with unofficial tcp: lookup table
 #%bcond_with	polish	# with double English+Polish messages
 #
+%define		vda_ver 2.3.7
 Summary:	Postfix Mail Transport Agent
 Summary(cs.UTF-8):	Postfix - program pro přepravu pošty (MTA)
 Summary(es.UTF-8):	Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -24,8 +25,7 @@
 Summary(sk.UTF-8):	Agent prenosu pošty Postfix
 Name:		postfix
 Version:	2.3.13
-%define		vda_ver 2.3.7
-Release:	1
+Release:	2
 Epoch:		2
 License:	distributable
 Group:		Networking/Daemons
@@ -325,12 +325,7 @@
 echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
 echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
 fi
-if [ "$1" = "1" ]; then
-	# only on installation, not upgrade
-	if ! grep -q "^myhostname" %{_sysconfdir}/mail/main.cf; then
-		postconf -e myhostname=`/bin/hostname -f`
-	fi
-else
+if [ "$1" -gt "1" ]; then
 	postfix upgrade-configuration
 fi
 
@@ -482,6 +477,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282.2.24  2007-12-11 16:23:15  glen
+- it startups fine without implicit myhostname in main.cf; rel 2
+
 Revision 1.282.2.23  2007-11-27 12:55:59  hawk
 - restored changelog from old AC-branch
 
================================================================

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