From 42d4f4d4eb8431e5744cb96f0ebd2d46701d50dc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 22 Jan 2024 08:23:34 +0100
Subject: update to version 6.9.13 patch level 5

drop patch merged upstream
---
 0001-fix-PKG_CONFIG_LIBDIR.patch | 59 ----------------------------------------
 ImageMagick6.spec                | 10 +++----
 2 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 0001-fix-PKG_CONFIG_LIBDIR.patch

diff --git a/0001-fix-PKG_CONFIG_LIBDIR.patch b/0001-fix-PKG_CONFIG_LIBDIR.patch
deleted file mode 100644
index 364dcb9..0000000
--- a/0001-fix-PKG_CONFIG_LIBDIR.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 169852b58e8cedfcf3a34ae0513ceb693a246851 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 8 Jan 2024 10:39:29 +0100
-Subject: [PATCH] fix PKG_CONFIG_LIBDIR
-
----
- Magick++/bin/Magick++-config.in | 4 +++-
- magick/MagickCore-config.in     | 4 +++-
- wand/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 3f96f4ddd..19450abcd 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/magick/MagickCore-config.in b/magick/MagickCore-config.in
-index bf78a198c..5b7f492d5 100644
---- a/magick/MagickCore-config.in
-+++ b/magick/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/wand/MagickWand-config.in b/wand/MagickWand-config.in
-index d38b661b4..03680cfdc 100644
---- a/wand/MagickWand-config.in
-+++ b/wand/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/ImageMagick6.spec b/ImageMagick6.spec
index 2b92bb6..c667f4f 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
 # Please preserve changelog entries
 #
 %global VER        6.9.13
-%global Patchlevel 4
+%global Patchlevel 5
 %global incsuffixe -6
 %global libsuffixe -6.Q16
 %bcond_without tests
@@ -73,8 +73,6 @@ Url:            http://www.imagemagick.org/
 #Source0:        https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
 Source0:        https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
 
-Patch0:         0001-fix-PKG_CONFIG_LIBDIR.patch
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -394,8 +392,6 @@ however.
 %prep
 %setup -q -n %{libname}-%{VER}-%{Patchlevel}
 
-%patch -P0 -p1
-
 # for %%doc
 mkdir Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -653,6 +649,10 @@ fi
 
 
 %changelog
+* Mon Jan 22 2024 Remi Collet <remi@remirepo.net> - 6.9.13.5-1
+- update to version 6.9.13 patch level 5
+- drop patch merged upstream
+
 * Mon Jan  8 2024 Remi Collet <remi@remirepo.net> - 6.9.13.4-1
 - update to version 6.9.13 patch level 4
 - add weak dependency on libheif-freeworld from RPMFusion (Fedora and EL-9)
-- 
cgit