diff options
Diffstat (limited to 'php-pecl-imagick.spec')
| -rw-r--r-- | php-pecl-imagick.spec | 117 |
1 files changed, 82 insertions, 35 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index d9725f7..dccf994 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -15,13 +15,15 @@ %endif %{?scl: %scl_package php-pecl-imagick} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} +%global gh_commit 623a3ac0386c93d62c60cbfe610505f2e35780f3 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner mkoppanen +%global gh_project imagick +#global gh_date 20151204 %global pecl_name imagick -#global prever RC2 -%global with_zts 0%{?__ztsphp:1} +#global prever RC6 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini %else @@ -33,15 +35,20 @@ Summary: Extension to create and modify images using ImageMagick Name: %{?sub_prefix}php-pecl-imagick -Version: 3.3.0 +Version: 3.4.0 +%if 0%{?gh_date} +Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz +%else Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +%endif License: PHP Group: Development/Languages URL: http://pecl.php.net/package/imagick -Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel %if "%{?vendor}" == "Remi Collet" @@ -49,21 +56,23 @@ BuildRequires: pcre-devel BuildRequires: ImageMagick-devel >= 6.8.8 Requires: ImageMagick-libs%{?_isa} >= %{imbuildver} %else -BuildRequires: ImageMagick-last-devel >= 6.9.2 +BuildRequires: ImageMagick-last-devel >= 6.9.3 Requires: ImageMagick-last-libs%{?_isa} >= %{imbuildver} %endif %else -BuildRequires: ImageMagick-devel >= 6.2.4 +BuildRequires: ImageMagick-devel >= 6.5.3 %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version}%{?prever} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?prever} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}%{?prever} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version}%{?prever} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?prever} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}%{?prever} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever} +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Conflicts: %{?scl_prefix}php-pecl-gmagick %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} @@ -80,6 +89,10 @@ Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.0" +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -107,10 +120,15 @@ These are the files needed to compile programs using %{pecl_name} extension. %prep -echo TARGET is %{name}-%{version}-%{release} %setup -q -c - +%if 0%{?gh_date} +mv %{gh_project}-%{gh_commit} NTS +mv NTS/package.xml . +sed -e 's/@PACKAGE_VERSION@/%{version}dev/' -i NTS/php_imagick.h +sed -e 's/3.3.0RC2/%{version}dev/' -i package.xml +%else mv %{pecl_name}-%{version}%{?prever} NTS +%endif # don't install any font (and test using it) # don't install empty file (d41d8cd98f00b204e9800998ecf8427e) @@ -119,6 +137,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS sed -e '/anonymous_pro_minus.ttf/d' \ -e '/015-imagickdrawsetresolution.phpt/d' \ -e '/OFL.txt/d' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml if grep '\.ttf' package.xml @@ -189,14 +208,18 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Test & Documentation -for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i +cd NTS +for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') +do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i + [ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i done -for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') +do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i + [ -f examples/$i ] && install -Dpm 644 examples/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/examples/$i done +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -213,18 +236,15 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check -%if 0%{?fedora} == 19 || 0%{?rhel} == 7 -# 001- success -# 001+ php: unable to acquire cache view `No such file or directory' @ fatal/cache-view.c/AcquireAuthenticCacheView/121. -# See https://bugzilla.redhat.com/1228034 -: ignore failed test with ImageMagick 6.7.8 -rm ?TS/tests/bug20636.phpt +%if 0%{?fedora} > 20 +%ifnarch x86_64 +rm ?TS/tests/025-get-color.phpt +%endif %endif -# https://github.com/mkoppanen/imagick/issues/97 -#rm ?TS/tests/024-ispixelsimilar.phpt : simple module load test for NTS extension cd NTS @@ -235,7 +255,7 @@ cd NTS : upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ NO_INTERACTION=1 \ %{__php} -n run-tests.php --show-diff @@ -249,11 +269,11 @@ cd ../ZTS --modules | grep %{pecl_name} : upstream test suite for ZTS extension -export TEST_PHP_EXECUTABLE=%{__ztsphp} -%{__ztsphp} -n run-tests.php \ - -n -q --show-diff \ - -d extension_dir=%{buildroot}%{php_ztsextdir} \ - -d extension=%{pecl_name}.so +TEST_PHP_EXECUTABLE=%{__ztsphp} \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ +REPORT_EXIT_STATUS=1 \ +NO_INTERACTION=1 \ +%{__ztsphp} -n run-tests.php --show-diff %endif @@ -286,8 +306,35 @@ rm -rf %{buildroot} %changelog -* Fri Dec 4 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-1 -- update to 3.3.0 +* Fri Mar 4 2016 Remi Collet <remi@fedoraproject.org> - 3.4.0-1 +- update to 3.4.0 (stable) + +* Sat Jan 30 2016 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.6.RC6 +- update to 3.4.0RC6 + +* Tue Jan 12 2016 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.5.RC5 +- update to 3.4.0RC5 + +* Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.4.RC4 +- update to 3.4.0RC4 + +* Sun Dec 13 2015 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.3.RC3 +- update to 3.4.0RC3 + +* Fri Dec 4 2015 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.2.RC2 +- update to 3.4.0RC2 + +* Fri Dec 4 2015 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.1.RC1 +- update to 3.4.0RC1 + +* Fri Dec 4 2015 Remi Collet <remi@fedoraproject.org> - 3.3.1-0.1.20151204git623a3ac +- rebuild as 3.3.1dev + +* Tue Nov 17 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.7.20151115gita806b85 +- update for test against IM 6.9.2-6 + +* Tue Nov 3 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.6.20150930gitfccdde3 +- git snapshot for PHP 7 * Thu Aug 13 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.5.RC2 - rebuild |