diff options
| author | Vlad Glagolev | 2013-03-24 17:24:48 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2013-03-24 17:24:48 +0400 |
| commit | 3f0db8c120b87f7adaff8cab21f5241c2c80cbef (patch) | |
| tree | 616df76ea801a44bfb4aed26608f07e26f045220 /php-pear | |
| parent | 886f2aba11a7c499daec9d3a6b36e63cb758e6b3 (diff) | |
php: added conflicts with fileinfo for PHP >=5.3
Diffstat (limited to 'php-pear')
| -rwxr-xr-x | php-pear/php/CONFLICTS | 9 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS index a51827b6e4..7703bf30e4 100755 --- a/php-pear/php/CONFLICTS +++ b/php-pear/php/CONFLICTS @@ -1,2 +1,9 @@ +. "$GRIMOIRE/FUNCTIONS" && + conflicts php-dev && -conflicts php4 +conflicts php4 && + +# PHP >=5.3 includes fileinfo +if spell_ok fileinfo && is_version_less 5.2.9999 "${VERSION}"; then + conflicts fileinfo y +fi diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index f673854e2c..3e78556b85 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -3,6 +3,7 @@ SECURITY_PATCH++ (CVE-2013-1643 and CVE-2013-1635); updated backports+security patches for legacy branch to 20130320 * DEPENDS: icu is available only since 5.3 + * CONFLICTS: added conflicts with fileinfo for PHP >=5.3 2013-02-27 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: switched stable to 5.4 (5.4.12); updated spell to 5.3.22 |