SPECS (cowiki-0_4_0-1_20060317_0_8): cowiki.spec - merge triggers ...

[glen]

Author: glen                         Date: Sat Aug 18 09:14:40 2007 GMT
Module: SPECS                         Tag: cowiki-0_4_0-1_20060317_0_8
---- Log message:
- merge triggers and php virtual deps from HEAD

---- Files affected:
SPECS:
   cowiki.spec (1.17 -> 1.17.2.1) 

---- Diffs:

================================================================
Index: SPECS/cowiki.spec
diff -u SPECS/cowiki.spec:1.17 SPECS/cowiki.spec:1.17.2.1
--- SPECS/cowiki.spec:1.17	Thu Jul 13 12:23:29 2006
+++ SPECS/cowiki.spec	Sat Aug 18 11:14:34 2007
@@ -4,7 +4,7 @@
 #  - theoretically mysql,mysqli,pgsql,sqlite connectors are possible.
 
 %define _snap 2006-03-17
-%define _rel 0.8
+%define _rel 0.9
 Summary:	Web collaboration tool
 Summary(pl):	Narzędzie do współpracy i współtworzenia w sieci
 Name:		cowiki
@@ -22,11 +22,11 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(mod_dir)
 Requires:	diffutils
-Requires:	php >= 4:5.0.2
-Requires:	php-dom
-Requires:	php-mysqli
-Requires:	php-pcre
+Requires:	php(dom)
+Requires:	php(mysqli)
+Requires:	php(pcre)
 Requires:	webapps
+Requires:	webserver(php) >= 5.0.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -140,10 +140,10 @@
 	touch %{_appdir}/htdocs/install.seal
 fi
 
-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1
+%triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
 %triggerin -- apache < 2.2.0, apache-base
@@ -234,6 +234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17.2.1  2007/08/18 09:14:34  glen
+- merge triggers and php virtual deps from HEAD
+
 Revision 1.17  2006/07/13 10:23:29  glen
 - include php.ini settings into the package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cowiki.spec?r1=1.17&r2=1.17.2.1&f=u