From: havner <havner@pld-linux.org>
Date: Tue, 16 Nov 2004 19:13:40 +0000 (+0000)
Subject: - conflicts for php4
X-Git-Tag: auto/ac/php-5_0_2-6~4
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=9801c1f9d8575e11ed60bacfbe23ca3be55fac10;p=packages%2Fphp.git

- conflicts for php4

Changed files:
    php.spec -> 1.368
---

diff --git a/php.spec b/php.spec
index de18d3a..ef01d11 100644
--- a/php.spec
+++ b/php.spec
@@ -206,6 +206,7 @@ PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php
+Conflicts:	php4
 
 %define		_sysconfdir	/etc/php
 %define		extensionsdir	%{_libdir}/php
@@ -324,6 +325,7 @@ 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.
@@ -350,6 +352,7 @@ Requires:	autoconf
 Requires:	automake
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:	php-pear-devel
+Conflicts:	php4-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.