packages: horde/horde.spec - drop old pre 3.0 triggers, php min version is ...

[glen]

Author: glen                         Date: Fri Apr  8 21:35:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop old pre 3.0 triggers, php min version is 5.2.0, update deps

---- Files affected:
packages/horde:
   horde.spec (1.190 -> 1.191) 

---- Diffs:

================================================================
Index: packages/horde/horde.spec
diff -u packages/horde/horde.spec:1.190 packages/horde/horde.spec:1.191
--- packages/horde/horde.spec:1.190	Fri Apr  8 23:18:05 2011
+++ packages/horde/horde.spec	Fri Apr  8 23:35:17 2011
@@ -7,6 +7,7 @@
 #   apache deny from all not needed.
 
 %define		hordeapp horde
+%define		php_min_version 5.2.0
 %include	/usr/lib/rpm/macros.php
 Summary:	The common Horde Framework for all Horde modules
 Summary(es.UTF-8):	Elementos básicos do Horde Web Application Suite
@@ -14,7 +15,7 @@
 Summary(pt_BR.UTF-8):	Componentes comuns do Horde usados por todos os módulos
 Name:		%{hordeapp}
 Version:	3.3.11
-Release:	3
+Release:	4
 License:	LGPL
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
@@ -33,23 +34,22 @@
 URL:		http://www.horde.org/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.595
-Requires(triggerpostun):	grep
-Requires(triggerpostun):	sed >= 4.0
-Requires:	php(domxml)
-Requires:	php(gd)
-Requires:	php(gettext)
-Requires:	php(imap)
-Requires:	php(json)
-Requires:	php(mbstring)
-Requires:	php(mcrypt)
-Requires:	php(pcre)
-Requires:	php(posix)
-Requires:	php(session)
-Requires:	php(xml)
-Requires:	php(zlib)
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-domxml
+Requires:	php-gd
+Requires:	php-gettext
+Requires:	php-imap
+Requires:	php-json
+Requires:	php-mbstring
+Requires:	php-mcrypt
+Requires:	php-pcre
 Requires:	php-pear-Log
 Requires:	php-pear-Mail
 Requires:	php-pear-Mail_Mime
+Requires:	php-posix
+Requires:	php-session
+Requires:	php-xml
+Requires:	php-zlib
 Requires:	webapps
 Requires:	webserver(php) >= 4.1.0
 # Suggests: smtpserver(for /usr/lib/sendmail) || smtp server
@@ -227,33 +227,6 @@
 %triggerun -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
-%triggerpostun -- horde < 3.0.7-1.4
-for i in conf.php hooks.php mime_drivers.php motd.php nls.php prefs.php registry.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
-	rm -f /etc/horde.org/apache-%{hordeapp}.conf.rpmsave
-fi
-
-if [ -L /etc/apache/conf.d/99_horde.conf ]; then
-	/usr/sbin/webapp register apache %{_webapp}
-	rm -f /etc/apache/conf.d/99_horde.conf
-	%service -q apache reload
-fi
-if [ -L /etc/httpd/httpd.conf/99_horde.conf ]; then
-	/usr/sbin/webapp register httpd %{_webapp}
-	rm -f /etc/httpd/httpd.conf/99_horde.conf
-	%service -q httpd reload
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc README README.PLD scripts util
@@ -297,6 +270,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.191  2011/04/08 21:35:17  glen
+- drop old pre 3.0 triggers, php min version is 5.2.0, update deps
+
 Revision 1.190  2011/04/08 21:18:05  glen
 - drop autopdeps bcond and contents
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde.spec?r1=1.190&r2=1.191&f=u