summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-08 09:42:58 +0200
committerRemi Collet <remi@remirepo.net>2020-04-08 09:42:58 +0200
commitfdec083057557d22e3ab09ed9dbddbf4e5551b60 (patch)
tree740a7e6b36073bda560fcc1a12ad6ad12412d1d6
parentc8b8a3c3762cf2f8e31ea4a25542daa710b16bc6 (diff)
drop dependency on ImageMagick6-libs for EL-7.8
see https://github.com/remicollet/remirepo/issues/144
-rw-r--r--php-pecl-imagick.spec11
1 files changed, 5 insertions, 6 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index a17decf..448f2f0 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -30,9 +30,6 @@
%global upstream_version 3.4.4
#global upstream_prever RC2
-# We don't really rely on upstream ABI
-%global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
-
Summary: Extension to create and modify images using ImageMagick
Name: %{?sub_prefix}php-pecl-imagick
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
@@ -40,7 +37,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 0.8.%{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: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
%endif
License: PHP
@@ -57,10 +54,8 @@ BuildRequires: %{?scl_prefix}php-pear
BuildRequires: pcre-devel
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
BuildRequires: ImageMagick-devel
-Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
%else
BuildRequires: ImageMagick6-devel
-Requires: ImageMagick6-libs%{?_isa} >= %{imbuildver}
%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -317,6 +312,10 @@ cd ../ZTS
%changelog
+* Wed Apr 1 2020 Remi Collet <remi@remirepo.net> - 3.4.4-10
+- drop dependency on ImageMagick6-libs for EL-7.8
+ see https://github.com/remicollet/remirepo/issues/144
+
* Thu Feb 27 2020 Remi Collet <remi@remirepo.net> - 3.4.4-9
- rebuild