build against ImageMagick6 and new soname

1 files changed, 15 insertions, 15 deletions

diff --git a/php-magickwand.spec b/php-magickwand.spec
index 61d7bb9..04f70fd 100644
--- a/php-magickwand.spec
+++ b/php-magickwand.spec
@@ -16,8 +16,6 @@
 %global patchlevel    2
 %global with_zts      0%{!?_without_zts:%{?__ztsphp:1}}
 
-# We don't really rely on upstream ABI
-%global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
 
 %if "%{php_version}" < "5.6"
 %global ini_name    %{pecl_name}.ini
@@ -28,7 +26,7 @@
 Summary:       PHP API for ImageMagick
 Name:          %{?scl_prefix}php-magickwand
 Version:       %{mainversion}%{?patchlevel:.%{patchlevel}}
-Release:       16%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:       19%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:       ImageMagick
 Group:         Development/Languages
 URL:           http://www.magickwand.org/
@@ -37,24 +35,21 @@ Source0:       http://image_magick.veidrodis.com/image_magick/php/MagickWandForP
 Source1:       magickwand.ini
 
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: %{?scl_prefix}php-devel < 7
-BuildRequires: autoconf, automake, libtool
+BuildRequires: make, gcc, autoconf, automake, libtool
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 # Ensure we use the more recent version from remi repo
-%if 0%{?fedora} >= 99 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 99 || 0%{?rhel} >= 99
 BuildRequires: ImageMagick-devel
-Requires:      ImageMagick-libs%{?_isa}  >= %{imbuildver}
 %else
 BuildRequires: ImageMagick6-devel
-Requires:      ImageMagick6-libs%{?_isa}  >= %{imbuildver}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 Obsoletes:      php53-magickwand
 Obsoletes:      php53u-magickwand
@@ -123,7 +118,6 @@ make %{?_smp_mflags}
 %endif
 
 %install
-rm -rf %{buildroot}
 make -C MagickWandForPHP-%{mainversion}     install-modules INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name}
 
@@ -148,12 +142,7 @@ install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc MagickWandForPHP-%{mainversion}/{AUTHOR,ChangeLog,CREDITS,LICENSE,README,TODO}
 
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -166,6 +155,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 22 2021 Remi Collet <remi@remirepo.net> - 8.10.5-3
+- build against ImageMagick6 and new soname
+
+* Thu Jul  9 2020 Remi Collet <remi@remirepo.net> - 1.0.9.2-18
+- build against ImageMagick on EL-7
+- drop dependency on ImageMagick6-libs for EL-7.8
+  see https://github.com/remicollet/remirepo/issues/144
+
+* Fri Mar  8 2019 Remi Collet <remi@remirepo.net> - 1.0.9.2-17
+- F30 build
+
 * Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 1.0.9.2-16
 - cleanup for EL-8