From 0fcc14161aa1bf0d2304617aa6a4ed1a32c2e47c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Oct 2017 18:19:46 +0200 Subject: test build with openjpeg2 static library on EL-7 --- ImageMagick6.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 3f67ba3..d68833b 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -73,7 +73,7 @@ Name: %{libname} Name: %{libname}6 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick @@ -107,8 +107,14 @@ BuildRequires: libwebp-devel BuildRequires: jbigkit-devel %endif %if %{with_jp2} +%if 0%{?rhel} == 7 +# See https://github.com/jcupitt/libvips/issues/764 +# vips pulls poppler (libopenjpeg) and IM (libopenjp2) +BuildRequires: openjpeg2-static-devel +%else BuildRequires: openjpeg2-devel >= 2.1.0 %endif +%endif %if %{with_gvc} BuildRequires: graphviz-devel >= 2.9.0 %endif @@ -565,6 +571,9 @@ fi %changelog +* Wed Oct 4 2017 Remi Collet - 6.9.9.17-2 +- test build with openjpeg2 static library on EL-7 + * Mon Oct 2 2017 Remi Collet - 6.9.9.17-1 - update to version 6.9.9 patch level 17 -- cgit