summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-06-13 18:16:16 +0200
committerRemi Collet <remi@remirepo.net>2018-06-13 18:16:16 +0200
commit5449bb5bd8ed428c8fd2a940f318008e1a3f9380 (patch)
treecb02b7e25c8ef1bc84545893f8859b0cf1c4334d
parent9d45d7fc8836fa85bbb1a83364a1eb80375afea3 (diff)
rebuild against ImageMagick6 (6.9.10-0)
-rw-r--r--php-pecl-imagick.spec22
1 files changed, 12 insertions, 10 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 7e71738..1a74ef7 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -6,6 +6,10 @@
#
# Please, preserve the changelog entries
#
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
%if 0%{?scl:1}
%global sub_prefix %{scl_prefix}
%scl_package php-pecl-imagick
@@ -35,30 +39,25 @@ Version: 3.4.3
Release: 0.3.%{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: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 11%{?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
Patch0: https://patch-diff.githubusercontent.com/raw/mkoppanen/imagick/pull/221.patch
+BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 5.4
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: pcre-devel
-%if 0%{?fedora} >= 27
-BuildRequires: ImageMagick-devel >= 1:6
-Requires: ImageMagick-libs%{?_isa} >= 1:%{imbuildver}
-%else
-%if 0%{?fedora} >= 25
-BuildRequires: ImageMagick-devel < 7
+%if 0%{?fedora} >= 99 || 0%{?rhel} >= 9
+BuildRequires: ImageMagick-devel
Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
%else
BuildRequires: ImageMagick6-devel
Requires: ImageMagick6-libs%{?_isa} >= %{imbuildver}
%endif
-%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -230,7 +229,7 @@ do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_docdir
done
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -301,6 +300,9 @@ cd ../ZTS
%changelog
+* Wed Jun 13 2018 Remi Collet <remi@remirepo.net> - 3.4.3-11
+- rebuild against ImageMagick6 (6.9.10-0)
+
* Tue Jun 5 2018 Remi Collet <remi@remirepo.net> - 3.4.3-10
- rebuild