- conflict on php4-common package to prevent breaking partially updated systems

Changed files:
    php.spec -> 1.625

diff --git a/php.spec b/php.spec
index 1dc516081cdcf20d82ad621123424951df3c63b8..4522578fe11b9474838f619d8c8039b9c0a1ad62 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -76,7 +76,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define        _rel 0.21
+%define        _rel 0.22
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr):   Le langage de script embarque-HTML PHP
 Summary(pl):   Jêzyk skryptowy PHP
@@ -388,7 +388,7 @@ Provides:   php5(thread-safety) = %{zend_zts}
 Obsoletes:     php-pcre < 4:5.2.0
 Obsoletes:     php-pecl-domxml
 Obsoletes:     php-session < 3:4.2.1-2
-# for the posttrans scriptlet, conflicts because in vserver enviroinment rpm package is not installed.
+Conflicts:     php4-common < 3:4.4.4-7
 Conflicts:     rpm < 4.4.2-0.2
 
 %description common