- i hope it will be ok this time, no conflicts for common packages

  cause they can work together when used separately (not by apache), only
  with apache they don't work, so conflicts for php and php4 packages
- devel packages obsolete themeselves (for builders)

Changed files:
    php4.spec -> 1.383

diff --git a/php4.spec b/php4.spec
index 27a6908b8f8352c7f04b36406ee599dd02afd68b..cd531fe91f8386682c7e01b60fee04bf95126f90 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -326,7 +326,6 @@ Group:              Libraries
 Provides:      %{name}-session = %{epoch}:%{version}-%{release}
 Provides:      php-session = %{epoch}:%{version}-%{release}
 Provides:      php-common = %{epoch}:%{version}-%{release}
-Conflicts:     php-common >= 3:5.0.0
 
 %description common
 Common files needed by both apache module and CGI.
@@ -352,8 +351,8 @@ Group:              Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      autoconf
 Requires:      automake
-Conflicts:     php-devel >= 3:5.0.0
 Provides:      php-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     php-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.