SPECS: qmail.spec - merge two triggers

[glen]

Author: glen                         Date: Wed Jul 13 08:03:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge two triggers

---- Files affected:
SPECS:
   qmail.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.141 SPECS/qmail.spec:1.142
--- SPECS/qmail.spec:1.141	Wed Jul 13 09:58:25 2005
+++ SPECS/qmail.spec	Wed Jul 13 10:03:52 2005
@@ -843,6 +843,20 @@
 %endif
 
 %triggerpostun -- %{name} <= 1.03-56.12
+# move dot-qmail to new location
+if [ -f /etc/qmail/dot-qmail.rpmsave ]; then
+	echo "Moving /etc/qmail/dot-qmail.rpmsave to /etc/qmail/control/defaultdelivery"
+	mv -f /etc/qmail/control/defaultdelivery /etc/qmail/control/defaultdelivery.rpmnew
+	mv -f /etc/qmail/dot-qmail.rpmsave /etc/qmail/control/defaultdelivery
+fi
+
+# move server cert to new location
+if [ -f /etc/qmail/control/cert.pem.rpmsave ]; then
+	echo "Moving /etc/qmail/control/cert.pem to /etc/qmail/control/servercert.pem"
+	mv -f /etc/qmail/control/servercert.pem /etc/qmail/control/servercert.pem.rpmnew
+	mv -f /etc/qmail/control/cert.pem.rpmsave /etc/qmail/control/servercert.pem
+fi
+
 if [ -f /var/lock/subsys/qmail ]; then
 	if [ -f /var/lock/subsys/qmail ]; then
 		. /etc/rc.d/init.d/functions
@@ -863,21 +877,6 @@
 	/etc/rc.d/init.d/rc-inetd reload
 fi
 
-# move dot-qmail to new location
-%triggerpostun -- %{name} <= 1.03-56.5
-if [ -f /etc/qmail/dot-qmail.rpmsave ]; then
-	echo "Moving /etc/qmail/dot-qmail.rpmsave to /etc/qmail/control/defaultdelivery"
-	mv -f /etc/qmail/control/defaultdelivery /etc/qmail/control/defaultdelivery.rpmnew
-	mv -f /etc/qmail/dot-qmail.rpmsave /etc/qmail/control/defaultdelivery
-fi
-
-# move server cert to new location
-if [ -f /etc/qmail/control/cert.pem.rpmsave ]; then
-	echo "Moving /etc/qmail/control/cert.pem to /etc/qmail/control/servercert.pem"
-	mv -f /etc/qmail/control/servercert.pem /etc/qmail/control/servercert.pem.rpmnew
-	mv -f /etc/qmail/control/cert.pem.rpmsave /etc/qmail/control/servercert.pem
-fi
-
 %postun
 # If package is being erased for the last time.
 if [ "$1" = "0" ]; then
@@ -1259,6 +1258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2005/07/13 08:03:52  glen
+- merge two triggers
+
 Revision 1.141  2005/07/13 07:58:25  glen
 - rel 58
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail.spec?r1=1.141&r2=1.142&f=u