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 | c489fb469f1c0574d121ae3173aec25ff2c414fa (patch) | |
| tree | a232f81fb2607ad01ea28e303642e882d06dbb98 | |
| parent | a63b88bb565558acee8da91748762a7de181c471 (diff) | |
php-pecl-* improve SCL build for 5.6 (wip)
| -rw-r--r-- | php-pecl-gmagick.spec | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec index 878be1d..bf0e157 100644 --- a/php-pecl-gmagick.spec +++ b/php-pecl-gmagick.spec @@ -19,7 +19,7 @@ Summary: Provides a wrapper to the GraphicsMagick library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.7 -Release: 0.3.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 0.4.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Libraries URL: http://pecl.php.net/package/%{pecl_name} @@ -43,15 +43,19 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Conflicts: %{?scl_prefix}php-pecl-imagick Conflicts: %{?scl_prefix}php-magickwand -%if 0%{!?scl:1} +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -%if "%{php_version}" > "5.5" Obsoletes: php53-pecl-%{pecl_name} Obsoletes: php53u-pecl-%{pecl_name} Obsoletes: php54-pecl-%{pecl_name} -%endif +Obsoletes: php54w-pecl-%{pecl_name} %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55w-pecl-%{pecl_name} +%endif +%if "%{php_version}" > "5.6" +Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} %endif %endif @@ -211,6 +215,9 @@ export TEST_PHP_EXECUTABLE=%{__ztsphp} %changelog +* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.7-0.4.RC2 +- improve SCL build + * Mon Mar 17 2014 Remi Collet <remi@fedoraproject.org> - 1.1.7-0.3.RC2 - Update to 1.1.7RC2 (beta) |