diff --git a/570a9a048bb0e3a5c221ca87be9408ae35f711e2.patch b/570a9a048bb0e3a5c221ca87be9408ae35f711e2.patch new file mode 100644 index 0000000..c056de9 --- /dev/null +++ b/570a9a048bb0e3a5c221ca87be9408ae35f711e2.patch @@ -0,0 +1,56 @@ +From 570a9a048bb0e3a5c221ca87be9408ae35f711e2 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 8 Jan 2024 19:13:39 +0100 +Subject: [PATCH] fix PKG_CONFIG_LIBDIR (#7013) + +--- + Magick++/bin/Magick++-config.in | 4 +++- + MagickCore/MagickCore-config.in | 4 +++- + MagickWand/MagickWand-config.in | 4 +++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in +index 877545c1a7..d55208a513 100755 +--- a/Magick++/bin/Magick++-config.in ++++ b/Magick++/bin/Magick++-config.in +@@ -7,7 +7,9 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" ++libdir=@libdir@ ++pkgconfigdir=@pkgconfigdir@ ++export PKG_CONFIG_LIBDIR="${pkgconfigdir}" + + usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version] + +diff --git a/MagickCore/MagickCore-config.in b/MagickCore/MagickCore-config.in +index ab790055d1..2263a1dd2d 100644 +--- a/MagickCore/MagickCore-config.in ++++ b/MagickCore/MagickCore-config.in +@@ -6,7 +6,9 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" ++libdir=@libdir@ ++pkgconfigdir=@pkgconfigdir@ ++export PKG_CONFIG_LIBDIR="${pkgconfigdir}" + + usage="\ + Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" +diff --git a/MagickWand/MagickWand-config.in b/MagickWand/MagickWand-config.in +index 647b80c2e7..03680cfdc8 100644 +--- a/MagickWand/MagickWand-config.in ++++ b/MagickWand/MagickWand-config.in +@@ -6,7 +6,9 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-export PKG_CONFIG_LIBDIR="${exec_prefix}/lib/pkgconfig" ++libdir=@libdir@ ++pkgconfigdir=@pkgconfigdir@ ++export PKG_CONFIG_LIBDIR="${pkgconfigdir}" + + usage="\ + Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" diff --git a/ImageMagick.spec b/ImageMagick.spec index b79d04c..dfdfbc0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ Epoch: 1 Epoch: 0 %endif Version: 7.1.1.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images %global VER %(foo=%{version}; echo ${foo:0:5}) @@ -37,6 +37,7 @@ Source2: ImageMagick.keyring # https://github.com/ImageMagick/ImageMagick/issues/6158 # https://github.com/ImageMagick/ImageMagick/commit/06d3b282a43457da6b3a2d3f84c33e07064a1e98 Patch0: ImageMagick-terminate-loop-on-sentinel.patch +Patch1: 570a9a048bb0e3a5c221ca87be9408ae35f711e2.patch BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) @@ -429,6 +430,9 @@ rm PerlMagick/demo/Generic.ttf %endif %changelog +* Mon Jan 15 2024 Sérgio Basto - 1:7.1.1.26-2 +- fix PKG_CONFIG_LIBDIR + * Mon Jan 08 2024 Fedora Release Monitoring - 1:7.1.1.26-1 - Update to 7.1.1.26 (#2239345)