SPECS (AC-branch): php.spec - HEAD merge: - php-sybase and php-syb...

[glen]

Author: glen                         Date: Thu Feb 22 18:44:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge:
- php-sybase and php-sybase-ct conflict each other. "Obsoletes" is not
  enough to prevent simultaneous installation of both.

---- Files affected:
SPECS:
   php.spec (1.631.2.19 -> 1.631.2.20) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.19 SPECS/php.spec:1.631.2.20
--- SPECS/php.spec:1.631.2.19	Wed Feb 21 23:22:19 2007
+++ SPECS/php.spec	Thu Feb 22 19:44:32 2007
@@ -1311,6 +1311,7 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sybase)
 Obsoletes:	php-sybase-ct
+Conflicts:	php-sybase-ct
 
 %description sybase
 This is a dynamic shared object (DSO) for PHP that will add Sybase and
@@ -1330,6 +1331,7 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(sybase-ct)
 Obsoletes:	php-sybase
+Conflicts:	php-sybase
 
 %description sybase-ct
 This is a dynamic shared object (DSO) for PHP that will add Sybase and
@@ -2713,6 +2715,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.20  2007/02/22 18:44:32  glen
+- HEAD merge:
+- php-sybase and php-sybase-ct conflict each other. "Obsoletes" is not
+  enough to prevent simultaneous installation of both.
+
 Revision 1.631.2.19  2007/02/21 22:22:19  blues
 - provides/obsoletes for smooth upgrade
 
================================================================

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