diff options
| -rw-r--r-- | php-pecl-imagick-dev.spec | 16 | ||||
| -rw-r--r-- | php-pecl-imagick.spec | 17 | 
2 files changed, 29 insertions, 4 deletions
| diff --git a/php-pecl-imagick-dev.spec b/php-pecl-imagick-dev.spec index b726d7b..ec6c3c7 100644 --- a/php-pecl-imagick-dev.spec +++ b/php-pecl-imagick-dev.spec @@ -6,6 +6,13 @@  #  # Please, preserve the changelog entries  # +%if 0%{?scl:1} +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{?scl_prefix} +%endif +%endif  %{?scl:          %scl_package        php-pecl-imagick}  %{!?php_inidir:  %global php_inidir  %{_sysconfdir}/php.d} @@ -25,9 +32,9 @@  %global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)  Summary:       Extension to create and modify images using ImageMagick -Name:          %{?scl_prefix}php-pecl-imagick +Name:          %{?sub_prefix}php-pecl-imagick  Version:       3.3.0 -Release:       0.3.RC2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release:       0.4.RC2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}  License:       PHP  Group:         Development/Languages  URL:           http://pecl.php.net/package/imagick @@ -86,6 +93,8 @@ Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}  Imagick is a native php extension to create and modify images  using the ImageMagick API. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. +  %package devel  Summary:       %{pecl_name} extension developer files (header) @@ -277,6 +286,9 @@ rm -rf %{buildroot}  %changelog +* Fri Jun 19 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.4.RC2 +- allow build against rh-php56 (as more-php56) +  * Tue Jun  2 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.3.RC2  - update to 3.3.0RC2 diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index a841b02..219a081 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -6,6 +6,13 @@  #  # Please, preserve the changelog entries  # +%if 0%{?scl:1} +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{?scl_prefix} +%endif +%endif  %{?scl:          %scl_package        php-pecl-imagick}  %{!?__pecl:      %global __pecl      %{_bindir}/pecl} @@ -23,9 +30,9 @@  %global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)  Summary:       Extension to create and modify images using ImageMagick -Name:          %{?scl_prefix}php-pecl-imagick +Name:          %{?sub_prefix}php-pecl-imagick  Version:       3.1.2 -Release:       5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release:       6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}  License:       PHP  Group:         Development/Languages  URL:           http://pecl.php.net/package/imagick @@ -84,6 +91,8 @@ Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}  Imagick is a native php extension to create and modify images  using the ImageMagick API. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. +  %prep  echo TARGET is %{name}-%{version}-%{release} @@ -245,7 +254,11 @@ rm -rf %{buildroot}  %{php_ztsincldir}/ext/%{pecl_name}  %endif +  %changelog +* Fri Jun 19 2015 Remi Collet <remi@fedoraproject.org> - 3.1.2-6 +- allow build against rh-php56 (as more-php56) +  * Thu Jun 11 2015 Remi Collet <remi@fedoraproject.org> - 3.1.2-5  - adapt for SCL | 
