SPECS: php.spec - fix conflicts

[glen]

Author: glen                         Date: Sun Nov 26 15:36:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix conflicts

---- Files affected:
SPECS:
   php.spec (1.625 -> 1.626) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.625 SPECS/php.spec:1.626
--- SPECS/php.spec:1.625	Sun Nov 26 16:14:01 2006
+++ SPECS/php.spec	Sun Nov 26 16:36:23 2006
@@ -389,7 +389,7 @@
 Obsoletes:	php-pcre < 4:5.2.0
 Obsoletes:	php-pecl-domxml
 Obsoletes:	php-session < 3:4.2.1-2
-Conflicts:	php4-common < 3:4.4.4-7
+Conflicts:	php4-common < 3:4.4.4-8
 Conflicts:	rpm < 4.4.2-0.2
 
 %description common
@@ -2718,6 +2718,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.626  2006/11/26 15:36:23  glen
+- fix conflicts
+
 Revision 1.625  2006/11/26 15:14:01  glen
 - conflict on php4-common package to prevent breaking partially updated systems
 
================================================================

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