From 56a7e649e0a7416fb4ba5c0b1d05972c609900dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jun 2020 08:53:43 +0200 Subject: update to version 6.9.11 patch level 20 revert upstream commit on EL-6 to fix broken build with old libtiff https://github.com/ImageMagick/ImageMagick6/issues/84 report behavior change with DrawSetTextInterlineSpacing https://github.com/ImageMagick/ImageMagick6/issues/85 --- ImageMagick6.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'ImageMagick6.spec') diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 5179e04..2a43486 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.11 -%global Patchlevel 19 +%global Patchlevel 20 %global incsuffixe -6 %global libsuffixe -6.Q16 %global with_tests 0%{!?_without_tests:1} @@ -78,6 +78,8 @@ Url: http://www.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: https://github.com/ImageMagick/ImageMagick6/commit/218d6abc4e36596c90a07463bfb2ab9e8312efbb.patch + BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -379,6 +381,9 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%if 0%{?rhel} == 6 +%patch0 -p1 -R +%endif # for %%doc mkdir Magick++/examples @@ -637,6 +642,13 @@ fi %changelog +* Mon Jun 22 2020 Remi Collet - 6.9.11.20-1 +- update to version 6.9.11 patch level 20 +- revert upstream commit on EL-6 to fix broken build with old libtiff + https://github.com/ImageMagick/ImageMagick6/issues/84 +- report behavior change with DrawSetTextInterlineSpacing + https://github.com/ImageMagick/ImageMagick6/issues/85 + * Mon Jun 15 2020 Remi Collet - 6.9.11.19-1 - update to version 6.9.11 patch level 19 -- cgit