diff options
| -rw-r--r-- | ImageMagick6.spec | 10 | ||||
| -rw-r--r-- | b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch | 22 |
2 files changed, 5 insertions, 27 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 2563d31..31ff660 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.8 -%global Patchlevel 7 +%global Patchlevel 8 %global incsuffixe -6 %global libsuffixe -6.Q16 %global with_tests 0%{!?_without_tests:1} @@ -57,15 +57,13 @@ Name: %{libname} Name: %{libname}6 %endif Version: %{VER}.%{Patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick Url: http://www.imagemagick.org/ Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz -Patch0: b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch - BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, giflib-devel, zlib-devel %if 0%{?fedora} >= 7 || 0%{?rhel} >= 6 @@ -286,7 +284,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch0 -p1 -b .upstream # for %%doc mkdir Magick++/examples @@ -524,6 +521,9 @@ fi %changelog +* Mon May 29 2017 Remi Collet <remi@remirepo.net> - 6.9.8.8-1 +- update to version 6.9.8 patch level 8 + * Sun May 28 2017 Remi Collet <remi@remirepo.net> - 6.9.8.7-2 - add upstream patch for #501 - use --with-openjp2 option on Enterprise Linux diff --git a/b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch b/b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch deleted file mode 100644 index e7923ca..0000000 --- a/b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc Mon Sep 17 00:00:00 2001 -From: Cristy <urban-warrior@imagemagick.org> -Date: Sun, 28 May 2017 06:43:22 -0400 -Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/501 - ---- - coders/jp2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/coders/jp2.c b/coders/jp2.c -index 2d519e692e..25b1798fdc 100644 ---- a/coders/jp2.c -+++ b/coders/jp2.c -@@ -393,7 +393,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) - (jp2_image->comps[0].dy != jp2_image->comps[i].dy) || - (jp2_image->comps[0].prec != jp2_image->comps[i].prec) || - (jp2_image->comps[0].sgnd != jp2_image->comps[i].sgnd) || -- (jp2_image->comps[i].data == NULL)) -+ ((image->ping == MagickFalse) && (jp2_image->comps[i].data == NULL))) - { - opj_destroy_codec(jp2_codec); - opj_image_destroy(jp2_image); |