SPECS: horde-passwd.spec - merge triggers

[glen]

Author: glen                         Date: Sun Jan  8 22:25:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge triggers

---- Files affected:
SPECS:
   horde-passwd.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.43 SPECS/horde-passwd.spec:1.44
--- SPECS/horde-passwd.spec:1.43	Sun Jan  8 21:28:07 2006
+++ SPECS/horde-passwd.spec	Sun Jan  8 23:24:57 2006
@@ -2,7 +2,7 @@
 %define		_hordeapp	passwd
 #define		_snap	2005-09-10
 #define		_rc		rc1
-%define		_rel	3.7
+%define		_rel	3.8
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	passwd - password change module for Horde
@@ -107,7 +107,7 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- horde-passwd <= 2.2-0.1
+%triggerpostun -- horde-%{_hordeapp} < 3.0-2.1
 for i in backends.php conf.php; do
 	if [ -f /home/services/httpd/html/horde/passwd/config/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -115,7 +115,6 @@
 	fi
 done
 
-%triggerpostun -- horde-%{_hordeapp} < 3.0-2.1
 for i in backends.php conf.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -167,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2006/01/08 22:24:57  glen
+- merge triggers
+
 Revision 1.43  2006/01/08 20:28:07  glen
 - use %service in triggers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.43&r2=1.44&f=u