SPECS: php4-mcache.spec, php4-pecl-memcache.spec - add conflict as...

[glen]

Author: glen                         Date: Tue Apr 25 18:58:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add conflict as memcached and mcache use same class name

---- Files affected:
SPECS:
   php4-mcache.spec (1.20 -> 1.21) , php4-pecl-memcache.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/php4-mcache.spec
diff -u SPECS/php4-mcache.spec:1.20 SPECS/php4-mcache.spec:1.21
--- SPECS/php4-mcache.spec:1.20	Tue Apr 25 20:44:27 2006
+++ SPECS/php4-mcache.spec	Tue Apr 25 20:58:03 2006
@@ -22,6 +22,7 @@
 %{?requires_php_extension}
 Requires(post,preun):	php-common >= 3:4.1
 Requires:	%{_sysconfdir}/conf.d
+Conflicts:	php4-pecl-memcache
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -109,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/04/25 18:58:03  glen
+- add conflict as memcached and mcache use same class name
+
 Revision 1.20  2006/04/25 18:44:27  glen
 - add real example
 

================================================================
Index: SPECS/php4-pecl-memcache.spec
diff -u SPECS/php4-pecl-memcache.spec:1.9 SPECS/php4-pecl-memcache.spec:1.10
--- SPECS/php4-pecl-memcache.spec:1.9	Tue Apr 25 20:37:57 2006
+++ SPECS/php4-pecl-memcache.spec	Tue Apr 25 20:58:03 2006
@@ -19,6 +19,7 @@
 %{?requires_php_extension}
 Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php4-pear-%{_modname}
+Conflicts:	php4-mcache
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/04/25 18:58:03  glen
+- add conflict as memcached and mcache use same class name
+
 Revision 1.9  2006/04/25 18:37:57  glen
 - package example.php to %doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4-mcache.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-memcache.spec?r1=1.9&r2=1.10&f=u