update to version 6.9.11 patch level 6

2 files changed, 5 insertions, 63 deletions

diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index 1ce7e86..e47797d 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
 # Please preserve changelog entries
 #
 %global VER        6.9.11
-%global Patchlevel 5
+%global Patchlevel 6
 %global incsuffixe -6
 %global libsuffixe -6.Q16
 %global with_tests 0%{!?_without_tests:1}
@@ -76,15 +76,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
 License:        ImageMagick
 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/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -386,7 +384,6 @@ however.
 
 %prep
 %setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1
 
 # for %%doc
 mkdir Magick++/examples
@@ -645,6 +642,9 @@ fi
 
 
 %changelog
+* Tue Apr  7 2020 Remi Collet <remi@remirepo.net> - 6.9.11.6-1
+- update to version 6.9.11 patch level 6
+
 * Mon Apr  6 2020 Remi Collet <remi@remirepo.net> - 6.9.11.5-2
 - test build for upstream patch for
   https://github.com/ImageMagick/ImageMagick6/issues/80
diff --git a/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch b/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch
deleted file mode 100644
index 1658552..0000000
--- a/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d Mon Sep 17 00:00:00 2001
-From: Cristy <mikayla-grace@urban-warrior.org>
-Date: Mon, 6 Apr 2020 10:54:53 -0400
-Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/80
-
----
- ChangeLog    |  7 +++++++
- coders/ept.c | 21 +++++++--------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/coders/ept.c b/coders/ept.c
-index d4cd72045..71f8c19c6 100644
---- a/coders/ept.c
-+++ b/coders/ept.c
-@@ -165,8 +165,7 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
-     ept_info;
- 
-   Image
--    *image,
--    *tiff_image;
-+    *image;
- 
-   ImageInfo
-     *read_info;
-@@ -255,27 +254,21 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
-   (void) CloseBlob(image);
-   image=DestroyImage(image);
-   read_info=CloneImageInfo(image_info);
--  read_info->number_scenes=1;
--  read_info->scene=0;
-   (void) CopyMagickString(read_info->magick,"EPS",MagickPathExtent);
-   image=BlobToImage(read_info,postscript_data,ept_info.postscript_length,
-     exception);
-+  if (image == (Image *) NULL)
-+    {
-+      (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
-+      image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception);
-+    }
-+  read_info=DestroyImageInfo(read_info);
-   if (image != (Image *) NULL)
-     {
-       (void) CopyMagickString(image->filename,image_info->filename,
-         MagickPathExtent);
-       (void) CopyMagickString(image->magick,"EPT",MagickPathExtent);
-     }
--  (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
--  tiff_image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception);
--  if (tiff_image != (Image *) NULL)
--    {
--      if (image == (Image *) NULL)
--        image=tiff_image;
--      else
--        AppendImageToList(&image,tiff_image);
--    }
--  read_info=DestroyImageInfo(read_info);
-   ept_info.tiff=(unsigned char *) RelinquishMagickMemory(ept_info.tiff);
-   ept_info.postscript=(unsigned char *) RelinquishMagickMemory(
-     ept_info.postscript);