summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-magickwand.spec13
2 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9d0fa4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.bz2
+*.src.rpm
+*/*rpm
diff --git a/php-magickwand.spec b/php-magickwand.spec
index c406d43..4908fd7 100644
--- a/php-magickwand.spec
+++ b/php-magickwand.spec
@@ -28,7 +28,7 @@
Summary: PHP API for ImageMagick
Name: %{?scl_prefix}php-magickwand
Version: %{mainversion}%{?patchlevel:.%{patchlevel}}
-Release: 11%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 12%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: ImageMagick
Group: Development/Languages
URL: http://www.magickwand.org/
@@ -45,20 +45,14 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-%if "%{?vendor}" == "Remi Collet"
# Ensure we use the more recent version from remi repo
-%if 0%{?fedora} > 99
+%if 0%{?fedora} > 26
BuildRequires: ImageMagick-devel
Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
%else
BuildRequires: ImageMagick6-devel
Requires: ImageMagick6-libs%{?_isa} >= %{imbuildver}
%endif
-%else
-# From upstream documentation
-BuildRequires: ImageMagick-devel >= 6.8.2
-Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
-%endif
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
@@ -172,6 +166,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Aug 5 2017 Remi Collet <remi@remirepo.net> - 1.0.9.2-12
+- rebuild against ImageMagick6 new soname (6.9.9-5)
+
* Sun Jan 29 2017 Remi Collet <remi@remirepo.net> - 1.0.9.2-11
- rebuild against ImageMagick6 new soname (6.9.7-6)