diff options
| author | Remi Collet <remi@remirepo.net> | 2024-01-22 08:05:09 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-01-22 08:05:09 +0100 |
| commit | 09ec7867436cdfc7420900af0f0ad9ce5909d53d (patch) | |
| tree | cef0b6b03fc8b564ad5a9e32d7b8679739cc4a6d | |
| parent | 0df8dd1b28ef22d29d1d60b2a1d4f2b862a34c5f (diff) | |
update to version 7.1.1 patch level 27
drop patch merged upstream
| -rw-r--r-- | 0001-fix-PKG_CONFIG_LIBDIR.patch | 59 | ||||
| -rw-r--r-- | ImageMagick7.spec | 10 |
2 files changed, 5 insertions, 64 deletions
diff --git a/0001-fix-PKG_CONFIG_LIBDIR.patch b/0001-fix-PKG_CONFIG_LIBDIR.patch deleted file mode 100644 index 1198a33..0000000 --- a/0001-fix-PKG_CONFIG_LIBDIR.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 f6a8593..2140466 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.1.1 -%global Patchlevel 26 +%global Patchlevel 27 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %bcond_without tests @@ -68,8 +68,6 @@ 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 @@ -398,8 +396,6 @@ 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 +653,10 @@ fi %changelog +* Mon Jan 22 2024 Remi Collet <remi@remirepo.net> - 7.1.1.27-1 +- update to version 7.1.1 patch level 27 +- drop patch merged upstream + * Mon Jan 8 2024 Remi Collet <remi@remirepo.net> - 7.1.1.26-1 - update to version 7.1.1 patch level 26 - add weak dependency on libheif-freeworld from RPMFusion (Fedora and EL-9) |