diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-25 10:57:04 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-25 10:57:04 +0200 |
| commit | 8fc986a135578c660039675b7f82f566a7466cd0 (patch) | |
| tree | 3cc87f2c6eba1b60323cbd98c3c9268834362220 | |
| parent | 96113ac79926f7c2fb6bba11fc2277e2240418d7 (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-imagick-dev.spec | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-imagick-dev.spec b/php-pecl-imagick-dev.spec index d4de306..2dbccce 100644 --- a/php-pecl-imagick-dev.spec +++ b/php-pecl-imagick-dev.spec @@ -27,7 +27,7 @@ Summary: Extension to create and modify images using ImageMagick Name: %{?scl_prefix}php-pecl-imagick Version: 3.2.0 -Release: 0.7.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 0.8.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/imagick @@ -64,15 +64,18 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?preve Conflicts: %{?scl_prefix}php-pecl-gmagick # Other third party repo stuff -%if "%{?vendor}" == "Remi Collet" +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} Obsoletes: php53-pecl-imagick Obsoletes: php53u-pecl-imagick Obsoletes: php54-pecl-imagick +Obsoletes: php54w-pecl-imagick %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-imagick +Obsoletes: php55w-pecl-imagick %endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-imagick +Obsoletes: php56w-pecl-imagick %endif %endif @@ -263,6 +266,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 3.2.0-0.8.RC1 +- improve SCL build + * Wed Jul 23 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.7.RC1 - ignore tests/bug20636.phpt with IM 6.7.8.9 - add fix for php 5.6 https://github.com/mkoppanen/imagick/pull/35 |