From 0df8dd1b28ef22d29d1d60b2a1d4f2b862a34c5f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 8 Jan 2024 11:12:13 +0100
Subject: fix config command using patch from
 https://github.com/ImageMagick/ImageMagick/pull/7013

---
 0001-fix-PKG_CONFIG_LIBDIR.patch | 59 ++++++++++++++++++++++++++++++++++++++++
 ImageMagick7.spec                |  6 ++++
 2 files changed, 65 insertions(+)
 create mode 100644 0001-fix-PKG_CONFIG_LIBDIR.patch

diff --git a/0001-fix-PKG_CONFIG_LIBDIR.patch b/0001-fix-PKG_CONFIG_LIBDIR.patch
new file mode 100644
index 0000000..1198a33
--- /dev/null
+++ b/0001-fix-PKG_CONFIG_LIBDIR.patch
@@ -0,0 +1,59 @@
+From 99b35375058be40b6b6a30b0770a11f63e62ab37 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 8 Jan 2024 10:25:06 +0100
+Subject: [PATCH] fix PKG_CONFIG_LIBDIR
+
+---
+ 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 877545c1a..d55208a51 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 ab790055d..2263a1dd2 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 647b80c2e..03680cfdc 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]"
+-- 
+2.43.0
+
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index ea1acad..f6a8593 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -68,6 +68,8 @@ Source0:        https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Pat
 Source1:        https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc
 Source2:        ImageMagick.keyring
 
+Patch0:         0001-fix-PKG_CONFIG_LIBDIR.patch
+
 BuildRequires:  gnupg2
 BuildRequires:  autoconf automake make
 BuildRequires:  gcc
@@ -396,6 +398,8 @@ however.
 %{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
 %setup -q -n %{libname}-%{VER}-%{Patchlevel}
 
+%patch -P0 -p1
+
 # for %%doc
 mkdir Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -657,6 +661,8 @@ fi
 - update to version 7.1.1 patch level 26
 - add weak dependency on libheif-freeworld from RPMFusion (Fedora and EL-9)
 - drop patch merged upstream
+- fix config command using patch from
+  https://github.com/ImageMagick/ImageMagick/pull/7013
 
 * Mon Jan  1 2024 Remi Collet <remi@remirepo.net> - 7.1.1.25-1
 - update to version 7.1.1 patch level 25
-- 
cgit