- 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:
    php.spec -> 1.371

diff --git a/php.spec b/php.spec
index 8ac25d55e72a2ddfbeae53e50872eb8aa1c13207..b5007ddbffa03e572fd557b4e64d5792443d1161 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -325,7 +325,6 @@ Summary(uk):        
 Group:         Libraries
 Provides:      %{name}-session = %{epoch}:%{version}-%{release}
 Obsoletes:     php-session <= %{epoch}:%{version}-%{release}
-Conflicts:     php4-common
 
 %description common
 Common files needed by both apache module and CGI.
@@ -352,7 +351,7 @@ Requires:   autoconf
 Requires:      automake
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:     php-pear-devel
-Conflicts:     php4-devel
+Obsoletes:     php4-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.