SPECS: php.spec - add P: php to -fcgi package - remove Obsoletes w...

[glen]

Author: glen                         Date: Fri Dec  2 14:07:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add P: php to -fcgi package
- remove Obsoletes which prevented apache1/apache package simulatenous install (no longer needed either)
- rel 18

---- Files affected:
SPECS:
   php.spec (1.512 -> 1.513) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.512 SPECS/php.spec:1.513
--- SPECS/php.spec:1.512	Thu Nov 24 11:17:27 2005
+++ SPECS/php.spec	Fri Dec  2 15:07:41 2005
@@ -84,7 +84,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-%define	_rel	17
+%define	_rel	18
 Release:	%{_rel}%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
@@ -298,12 +298,9 @@
 Requires(post,preun):	%{__perl}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
-# Obsolete all php5 packages, this is not to obsolete php4 companion
-Obsoletes:	php >= 4:5.0.0
 
 %description -n apache1-mod_php
 PHP as DSO module for apache 1.3.x.
@@ -318,12 +315,9 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache >= 2.0.52-2
 Requires:	apache(modules-api) = %{apache_modules_api}
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
-# Obsolete all php5 packages, this is not to obsolete php4 companion
-Obsoletes:	php >= 4:5.0.0
 
 %description -n apache-mod_php
 PHP as DSO module for apache 2.x.
@@ -336,6 +330,7 @@
 Summary(pl):	php jako program FastCGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Provides:	php = %{epoch}:%{version}-%{release}
 
 %description fcgi
 php as FastCGI program.
@@ -3028,6 +3023,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.513  2005/12/02 14:07:41  glen
+- add P: php to -fcgi package
+- remove Obsoletes which prevented apache1/apache package simulatenous install (no longer needed either)
+- rel 18
+
 Revision 1.512  2005/11/24 10:17:27  arekm
 - xml needs to be loaded before wddx
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.512&r2=1.513&f=u