Author: hawk Date: Wed Jan 23 15:07:37 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- merged HEAD changes
---- Files affected:
SPECS:
postfix.spec (1.302.2.1 -> 1.302.2.2)
---- Diffs:
================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.302.2.1 SPECS/postfix.spec:1.302.2.2
--- SPECS/postfix.spec:1.302.2.1 Mon Nov 12 22:44:53 2007
+++ SPECS/postfix.spec Wed Jan 23 16:07:32 2008
@@ -11,6 +11,7 @@
%bcond_with hir # with Beeth's header_if_reject patch
%bcond_with tcp # with unofficial tcp: lookup table
#
+%define vda_ver 2.4.5
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
@@ -20,8 +21,7 @@
Summary(sk.UTF-8): Agent prenosu poĹĄty Postfix
Name: postfix
Version: 2.4.6
-%define vda_ver 2.4.5
-Release: 1
+Release: 4
Epoch: 2
License: distributable
Group: Networking/Daemons
@@ -225,7 +225,7 @@
Summary: monit support for Postfix
Summary(pl.UTF-8): Wsparcie monita dla Postfiksa
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: monit
%description -n monit-rc-%{name}
@@ -338,12 +338,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
@@ -500,6 +495,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.302.2.2 2008-01-23 15:07:32 hawk
+- merged HEAD changes
+
Revision 1.302.2.1 2007-11-12 21:44:53 hawk
- disabled vda
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postfix.spec?r1=1.302.2.1&r2=1.302.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
