- add P: php to -fcgi package

- remove Obsoletes which prevented apache1/apache package simulatenous install (no longer needed either)
- rel 18

Changed files:
    php.spec -> 1.513

diff --git a/php.spec b/php.spec
index 4e6b49e9bd2c7c6fd645a5ef81dc852e95722ad3..f2db9559d05c6c22fe941247aa7ccc0427bf76c1 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -83,7 +83,7 @@ Summary(ru):  PHP 
 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
@@ -297,12 +297,9 @@ Requires(post,preun):      %{apxs1}
 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.
@@ -317,12 +314,9 @@ Group:             Development/Languages/PHP
 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.
@@ -335,6 +329,7 @@ Summary:    php as FastCGI program
 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.