From 8421f80f97f69fb82de61c72a353e5d8105bc9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 May 2022 01:57:43 +0100 Subject: [PATCH] Update ImageMagick to 6.9.12.50 (#2087046) Don't use the eln macro, you should use rhel recommended by Stephen Gallagher add support libzst --- .gitignore | 1 + ...9-3-multiarch-implicit-pkgconfig-dir.patch | 28 ------------------- ImageMagick.spec | 17 +++++++---- 3 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch diff --git a/.gitignore b/.gitignore index 91e7994..8f74af5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ImageMagick-6.9.12-43.tar.xz /ImageMagick-6.9.12-44.tar.xz /ImageMagick-6.9.12-48.tar.xz +/ImageMagick-6.9.12-50.tar.xz diff --git a/ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch b/ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch deleted file mode 100644 index 64cefc0..0000000 --- a/ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch +++ /dev/null @@ -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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 533f327..5089bc7 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -9,8 +9,8 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 6.9.12.48 -Release: 3%{?dist} +Version: 6.9.12.50 +Release: 1%{?dist} Summary: An X application for displaying and manipulating images %global VER %(foo=%{version}; echo ${foo:0:6}) @@ -22,7 +22,7 @@ Source0: https://www.imagemagick.org/download/releases/%{name}-%{VER}-%{P BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 BuildRequires: perl-generators -%if 0%{?fedora} > 27 +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 BuildRequires: libgs-devel, ghostscript-x11 %else BuildRequires: ghostscript-devel @@ -31,7 +31,7 @@ BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(libwmf), pkgconfig(jasper), libtool-ltdl-devel BuildRequires: pkgconfig(x11), pkgconfig(xext), pkgconfig(xt) BuildRequires: pkgconfig(lcms2), pkgconfig(libxml-2.0), pkgconfig(librsvg-2.0) -%if 0%{?fedora} > 34 || 0%{?epel} > 8 +%if 0%{?fedora} > 34 || 0%{?rhel} > 8 BuildRequires: pkgconfig(OpenEXR) %else BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 @@ -42,6 +42,7 @@ BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 BuildRequires: pkgconfig(libcgraph) >= 2.9.0 BuildRequires: pkgconfig(raqm) BuildRequires: pkgconfig(libraw) >= 0.14.8 +BuildRequires: pkgconfig(libzstd) BuildRequires: autoconf automake gcc gcc-c++ BuildRequires: make @@ -187,9 +188,7 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" --without-gcc-arch \ --with-jbig \ --with-openjp2 \ -%ifnarch s390x --with-raw \ -%endif --with-gvc \ --with-raqm @@ -330,6 +329,12 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Sun May 29 2022 Sérgio Basto - 1:6.9.12.50-1 +- Update ImageMagick to 6.9.12.50 (#2087046) +- Don't use the %{?eln} macro, you should use %{?rhel} recommended by Stephen + Gallagher +- add support libzst + * Thu May 12 2022 Steve Traylen - 1:6.9.12.48-3 - libraw-epel now available for aarch64 and s390 - allow smooth upgrade for 3rd party repository providing latest version/soname as ImageMagick6