diff options
| author | Remi Collet <remi@remirepo.net> | 2024-11-18 08:07:27 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-11-18 08:07:27 +0100 |
| commit | e3ea28bd5c4f648f976bab9a1c32d552e3930fdf (patch) | |
| tree | 37a5ab1430831c26095b42817ddf298d175ca95f | |
| parent | 2e170b7343c6ce49b1ef6e2aa6793938c488e2a7 (diff) | |
drop patch merged upstream
| -rw-r--r-- | ImageMagick7.spec | 10 | ||||
| -rw-r--r-- | revert-map-changes.patch | 30 |
2 files changed, 5 insertions, 35 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 8387d29..bb843db 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.1.1 -%global Patchlevel 40 +%global Patchlevel 41 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %bcond_without tests @@ -63,8 +63,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: revert-map-changes.patch - BuildRequires: gnupg2 BuildRequires: autoconf automake make BuildRequires: gcc @@ -350,8 +348,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 @@ -601,6 +597,10 @@ fi %changelog +* Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 7.1.1.41-1 +- update to version 7.1.1 patch level 41 +- drop patch merged upstream + * Tue Nov 12 2024 Remi Collet <remi@remirepo.net> - 7.1.1.40-1 - update to version 7.1.1 patch level 40 - fix ABI break using patch from diff --git a/revert-map-changes.patch b/revert-map-changes.patch deleted file mode 100644 index 3d79921..0000000 --- a/revert-map-changes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8de691a078d95e1f2b75ac2fe940fd2478d6b99f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 12 Nov 2024 07:26:09 +0100 -Subject: [PATCH] revert map changes breaking ABI - ---- - MagickCore/libMagickCore.map | 2 +- - MagickWand/libMagickWand.map | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map -index 8da9bba7866..7437b0499a6 100644 ---- a/MagickCore/libMagickCore.map -+++ b/MagickCore/libMagickCore.map -@@ -1,4 +1,4 @@ -- VERS_10.2 { -+ VERS_10.0 { - global: - *; - }; -diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map -index 8da9bba7866..7437b0499a6 100644 ---- a/MagickWand/libMagickWand.map -+++ b/MagickWand/libMagickWand.map -@@ -1,4 +1,4 @@ -- VERS_10.2 { -+ VERS_10.0 { - global: - *; - }; |