SPECS: horde-turba.spec - never use '<=' in trigger comparision (w...

[glen]

Author: glen                         Date: Wed Feb  6 20:18:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- never use '<=' in trigger comparision (well just drop old triggers); rel 2

---- Files affected:
SPECS:
   horde-turba.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.88 SPECS/horde-turba.spec:1.89
--- SPECS/horde-turba.spec:1.88	Wed Jan  9 17:44:46 2008
+++ SPECS/horde-turba.spec	Wed Feb  6 21:18:28 2008
@@ -2,7 +2,7 @@
 %define	_hordeapp turba
 #define	_snap	2005-10-17
 %define	_rc		rc1
-%define	_rel	1
+%define	_rel	2
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Turba - Address book for IMP
@@ -158,44 +158,6 @@
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- turba <= 1.2.2-2
-if [ -f /etc/httpd/httpd.conf ]; then
-	sed -i -e '/^Include.*turba.conf/d' /etc/httpd/httpd.conf
-fi
-
-if [ -f /etc/httpd/turba.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
-	mv -f /etc/httpd/turba.conf.rpmsave %{_sysconfdir}/apache.conf
-fi
-
-%service -q httpd restart
-
-%triggerpostun -- horde-%{_hordeapp} < 2.1-1.rc2.0.2, %{_hordeapp}
-for i in attributes.php conf.php menu.php prefs.php sources.php; do
-	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
-		mv -f %{_sysconfdir}/$i{,.rpmnew}
-		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
-	fi
-done
-
-if [ -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave ]; then
-	mv -f %{_sysconfdir}/apache.conf{,.rpmnew}
-	mv -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-	cp -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave %{_sysconfdir}/apache.conf
-	cp -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave %{_sysconfdir}/httpd.conf
-fi
-
-if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
-	/usr/sbin/webapp register apache %{_webapp}
-	rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
-	%service -q apache reload
-fi
-if [ -L /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf ]; then
-	/usr/sbin/webapp register httpd %{_webapp}
-	rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
-	%service -q httpd reload
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README docs/* scripts/*.reg scripts/ldap scripts/sql
@@ -226,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2008-02-06 20:18:28  glen
+- never use '<=' in trigger comparision (well just drop old triggers); rel 2
+
 Revision 1.88  2008-01-09 16:44:46  paszczus
 - updated to 2.2-rc1; removed Patch0 (applied in sources)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-turba.spec?r1=1.88&r2=1.89&f=u