Author: glen Date: Sun Jan 8 22:23:23 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merge triggers
---- Files affected: SPECS: horde-imp.spec (1.104 -> 1.105) ---- Diffs: ================================================================ Index: SPECS/horde-imp.spec diff -u SPECS/horde-imp.spec:1.104 SPECS/horde-imp.spec:1.105 --- SPECS/horde-imp.spec:1.104 Sun Jan 8 16:22:45 2006 +++ SPECS/horde-imp.spec Sun Jan 8 23:23:18 2006 @@ -2,7 +2,7 @@ %define _hordeapp imp #define _snap 2005-08-22 %define _rc rc1 -%define _rel 1.3 +%define _rel 1.4 # %include /usr/lib/rpm/macros.php Summary: Web Based IMAP Mail Program @@ -115,7 +115,7 @@ %triggerun -- apache >= 2.0.0 %webapp_unregister httpd %{_webapp} -%triggerpostun -- imp <= 4.0.2-1 +%triggerpostun -- horde-imp < 4.0.4-1.10, imp for i in conf.php filter.txt header.txt html.php menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do if [ -f /home/services/httpd/html/horde/imp/config/$i.rpmsave ]; then mv -f %{_sysconfdir}/$i{,.rpmnew} @@ -129,10 +129,9 @@ cp -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache.conf cp -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/httpd.conf rm -f /etc/httpd/imp.conf.rpmsave - %service -q httpd reload + httpd_reload=1 fi -%triggerpostun -- horde-imp < 4.0.4-1.10, imp < 4.0.4-1.10 for i in conf.php filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do if [ -f /etc/horde.org/imp/$i.rpmsave ]; then mv -f %{_sysconfdir}/$i{,.rpmnew} @@ -156,6 +155,10 @@ if [ -L /etc/httpd/httpd.conf/99_horde-imp.conf ]; then rm -f /etc/httpd/httpd.conf/99_horde-imp.conf /usr/sbin/webapp register httpd %{_webapp} + httpd_reload=1 +fi + +if [ "$httpd_reload" ]; then %service -q httpd reload fi @@ -186,6 +189,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.105 2006/01/08 22:23:18 glen +- merge triggers + Revision 1.104 2006/01/08 15:22:45 glen - trigger also to old package name ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.104&r2=1.105&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit