Merge branch 'master' into master-riscv64

.gitignore

@@ -1 +1 @@
-/ImageMagick-6.9.10-86.tar.xz
+/ImageMagick-6.9.11-22.tar.xz

ImageMagick-6.9.11.22-permit-reading-of-MPRI-images.patch

@@ -0,0 +1,26 @@
+From 4c93a9feb75cd18ff11ae96907c2b5663eb58200 Mon Sep 17 00:00:00 2001
+From: Cristy <mikayla-grace@urban-warrior.org>
+Date: Tue, 30 Jun 2020 21:38:22 -0400
+Subject: [PATCH 1/3] permit reading of MPRI images
+
+---
+ magick/draw.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/magick/draw.c b/magick/draw.c
+index eb2323a3d..401f6c15d 100644
+--- a/magick/draw.c
++++ b/magick/draw.c
+@@ -5391,7 +5391,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
+             (void) CopyMagickString(clone_info->filename,primitive_info->text,
+               MagickPathExtent);
+             status&=SetImageInfo(clone_info,0,exception);
+-            if (LocaleNCompare(clone_info->magick,"http",4) == 0)
++            if ((LocaleNCompare(clone_info->magick,"http",4) == 0) ||
++                (LocaleCompare(clone_info->magick,"mpri") == 0))
+               (void) CopyMagickString(clone_info->filename,primitive_info->text,
+                 MagickPathExtent);
+             composite_images=ReadImage(clone_info,exception);
+-- 
+2.26.2
+

ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch

@@ -1,28 +0,0 @@
-diff -Nur ImageMagick-6.9.9-3.orig/wand/MagickWand-config.in ImageMagick-6.9.9-3/wand/MagickWand-config.in
---- ImageMagick-6.9.9-3.orig/wand/MagickWand-config.in	2017-07-24 06:37:55.000000000 -0700
-+++ ImageMagick-6.9.9-3/wand/MagickWand-config.in	2017-07-27 15:17:55.343675457 -0700
-@@ -38,19 +38,19 @@
-       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
-       ;;
-     --cflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      pkg-config --cflags MagickWand
-       ;;
-     --cxxflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      pkg-config --cflags MagickWand
-       ;;
-     --cppflags)
--      @PKG_CONFIG@ --cflags MagickWand
-+      pkg-config --cflags MagickWand
-       ;;
-     --ldflags)
--      @PKG_CONFIG@ --libs MagickWand
-+      pkg-config --libs MagickWand
-       ;;
-     --libs)
--      @PKG_CONFIG@ --libs MagickWand
-+      pkg-config --libs MagickWand
-       ;;
-     *)
-       echo "${usage}" 1>&2

ImageMagick.spec

@@ -1,5 +1,5 @@
-%global VER 6.9.10
-%global Patchlevel 86
+%global VER 6.9.11
+%global Patchlevel 22
 
 Name:		ImageMagick
 %if 0%{?fedora} >= 27
@@ -10,14 +10,15 @@ Epoch:		1
 Epoch:		0
 %endif
 Version:	%{VER}.%{Patchlevel}
-Release:	3%{?dist}.rvre1
+Release:	2%{?dist}
 Summary:	An X application for displaying and manipulating images
 
 License:	ImageMagick
 Url:		http://www.imagemagick.org/
 Source0:	https://www.imagemagick.org/download/%{name}-%{VER}-%{Patchlevel}.tar.xz
-
-Patch0:		ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch
+# https://github.com/rmagick/rmagick/issues/1224
+# https://github.com/ImageMagick/ImageMagick6/commit/4c93a9feb75cd18ff11ae96907c2b5663eb58200
+Patch1:	%{name}-6.9.11.22-permit-reading-of-MPRI-images.patch
 
 BuildRequires:	bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
 BuildRequires:	libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
@@ -34,10 +35,10 @@ BuildRequires:	lcms2-devel, libxml2-devel, librsvg2-devel
 BuildRequires:	fftw-devel, ilmbase-devel, OpenEXR-devel, libwebp-devel
 BuildRequires:	jbigkit-devel
 BuildRequires:	openjpeg2-devel >= 2.1.0
-BuildRequires:  graphviz-devel >= 2.9.0
-BuildRequires:  libraqm-devel
-BuildRequires:  liblqr-1-devel
-BuildRequires:  LibRaw-devel >= 0.14.8
+BuildRequires:	graphviz-devel >= 2.9.0
+BuildRequires:	libraqm-devel
+BuildRequires:	liblqr-1-devel
+BuildRequires:	LibRaw-devel >= 0.14.8
 BuildRequires:	autoconf automake gcc gcc-c++
 
 Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@@ -61,14 +62,6 @@ ImageMagick-devel as well.
 %package devel
 Summary:	Library links and header files for ImageMagick app development
 Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}
-%if 0%{?fedora} > 27
-Requires:	libgs-devel
-%else
-Requires:	ghostscript-devel
-%endif
-Requires:	libX11-devel, libXext-devel, libXt-devel
-Requires:	bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel
-Requires:	libwebp-devel, OpenEXR-devel, jasper-devel, pkgconfig
 Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -151,9 +144,7 @@ however.
 
 %prep
 %setup -q -n %{name}-%{VER}-%{Patchlevel}
-
-%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir
-
+%patch1 -p1
 
 # for %%doc
 mkdir Magick++/examples
@@ -325,11 +316,24 @@ rm PerlMagick/demo/Generic.ttf
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
-* Thu Jul 16 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 6.9.10.86-3.rvre1
-- Rebuilt for Fedora RISCV, no changes
+* Thu Jul  2 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:6.9.11.22-2
+- Backport upstream patch to make ruby rmagick test pass (bug 1844192)
 
-* Sun May 17 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 6.9.10.86-3.rvre0
-- Rebuilt for Fedora RISCV, no changes
+* Mon Jun 29 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.11.22-1
+- Update to 6.9.11.22
+
+* Sat Jun 27 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:6.9.11.21-2
+- Perl 5.32 re-rebuild updated packages
+
+* Thu Jun 25 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.11.21-1
+- Update to 6.9.11.21
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:6.9.11.16-2
+- Perl 5.32 rebuild
+
+* Wed Jun 03 2020 Michael Cronenworth <mike@cchtml.com> - 1:6.9.11.16-1
+- Update to 6.9.11.16
+- Drop extra BRs on -devel package (RHBZ#1835344)
 
 * Mon May 11 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:6.9.10.86-3
 - Rebuild for new LibRaw

sources

@@ -1 +1 @@
-SHA512 (ImageMagick-6.9.10-86.tar.xz) = 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
+SHA512 (ImageMagick-6.9.11-22.tar.xz) = 9c6f4ab3f881b4aba4de3fde2d49ed66773b52dacbdc24c92eba6b8b1e97ea28b983cbd9fbcf4721f4b46ab8d249470f44e1cc7e173728d78f2ef049f4aa42c0