Update to 6.9.11.16

5 years ago · 037c6ad1b5
parent 2efc6b5991
commit 037c6ad1b5
4 changed files with 9 additions and 46 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/ImageMagick-6.9.10-86.tar.xz
+/ImageMagick-6.9.11-16.tar.xz
--- a/ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch
+++ b/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
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@ -1,5 +1,5 @@
-%global VER 6.9.10
-%global Patchlevel 86
+%global VER 6.9.11
+%global Patchlevel 16

 Name:		ImageMagick
 %if 0%{?fedora} >= 27
@ -10,15 +10,13 @@ Epoch:		1
 Epoch:		0
 %endif
 Version:	%{VER}.%{Patchlevel}
-Release:	3%{?dist}
+Release:	1%{?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
-
 BuildRequires:	bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
 BuildRequires:	libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
 BuildRequires:	perl-generators
@ -61,14 +59,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
@ -152,9 +142,6 @@ however.
 %prep
 %setup -q -n %{name}-%{VER}-%{Patchlevel}

-%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir
-
-
 # for %%doc
 mkdir Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@ -325,6 +312,10 @@ rm PerlMagick/demo/Generic.ttf
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt

 %changelog
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ImageMagick-6.9.10-86.tar.xz) = 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
+SHA512 (ImageMagick-6.9.11-16.tar.xz) = ae4c56afdde8d62f80cfc32e208595f50b4e1d3cdfffbf1f18a5ad1f715998bcc917fe595369cda216d13ebd7121c060376a3ed6c0558dcd508f0142b108e2ff