summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick7.spec10
-rw-r--r--f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch22
2 files changed, 5 insertions, 27 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index aa96d9b..4a544b0 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.0.5
-%global Patchlevel 8
+%global Patchlevel 9
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%global with_tests 0%{!?_without_tests:1}
@@ -60,15 +60,13 @@ Name: %{libname}
Name: %{libname}7
%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: f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
-
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
@@ -285,7 +283,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1 -b .upstream
# for %%doc
mkdir Magick++/examples
@@ -501,6 +498,9 @@ make %{?_smp_mflags} check
%changelog
+* Mon May 29 2017 Remi Collet <remi@remirepo.net> - 7.0.5.9-1
+- update to version 7.0.5 patch level 9
+
* Sun May 28 2017 Remi Collet <remi@remirepo.net> - 7.0.5.8-2
- add upstream patch for #501
- use --with-openjp2 option on Enterprise Linux
diff --git a/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch b/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
deleted file mode 100644
index 231f816..0000000
--- a/f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f13c6b54a879aaa771ec64b5a066b939e8f8e7f0 Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sun, 28 May 2017 06:42:25 -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 94b775e1ca..b9fe4ab001 100644
---- a/coders/jp2.c
-+++ b/coders/jp2.c
-@@ -391,7 +391,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);