diff options
| -rw-r--r-- | 0001-Fix-8819-revert-soname-change.patch | 65 | ||||
| -rw-r--r-- | ImageMagick7.spec | 30 |
2 files changed, 89 insertions, 6 deletions
diff --git a/0001-Fix-8819-revert-soname-change.patch b/0001-Fix-8819-revert-soname-change.patch new file mode 100644 index 0000000..7c43831 --- /dev/null +++ b/0001-Fix-8819-revert-soname-change.patch @@ -0,0 +1,65 @@ +From 7d783a9914bd845a49a6639b44d73a5f51c7f054 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 24 Jun 2026 07:30:59 +0200 +Subject: [PATCH] Fix #8819 revert soname change + +--- + MagickCore/libMagickCore.map | 2 +- + MagickWand/libMagickWand.map | 2 +- + configure | 4 ++-- + m4/version.m4 | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map +index b638dd10d..7437b0499 100644 +--- a/MagickCore/libMagickCore.map ++++ b/MagickCore/libMagickCore.map +@@ -1,4 +1,4 @@ +- VERS_11.0 { ++ VERS_10.0 { + global: + *; + }; +diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map +index b638dd10d..7437b0499 100644 +--- a/MagickWand/libMagickWand.map ++++ b/MagickWand/libMagickWand.map +@@ -1,4 +1,4 @@ +- VERS_11.0 { ++ VERS_10.0 { + global: + *; + }; +diff --git a/configure b/configure +index a8fe1ba10..cac91541f 100755 +--- a/configure ++++ b/configure +@@ -5393,8 +5393,8 @@ MAGICK_GIT_REVISION=38ba210c5:20260621 + + + # Substitute library versioning +-MAGICK_LIBRARY_CURRENT=11 +-MAGICK_LIBRARY_REVISION=2 ++MAGICK_LIBRARY_CURRENT=10 ++MAGICK_LIBRARY_REVISION=3 + MAGICK_LIBRARY_AGE=0 + MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` + +diff --git a/m4/version.m4 b/m4/version.m4 +index bfc0db994..833ddc205 100644 +--- a/m4/version.m4 ++++ b/m4/version.m4 +@@ -48,8 +48,8 @@ m4_define([magick_tarname], [ImageMagick]) + # files if you raise these versions. + # + # Bump the minor release # whenever there is an SOVersion bump. +-m4_define([magick_library_current], [11]) +-m4_define([magick_library_revision], [2]) ++m4_define([magick_library_current], [10]) ++m4_define([magick_library_revision], [3]) + m4_define([magick_library_age], [0]) + + m4_define([magickpp_library_current], [5]) +-- +2.54.0 + diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 54d6834..12c46c4 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.1.2 -%global Patchlevel 25 +%global Patchlevel 26 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %bcond_without tests @@ -51,6 +51,11 @@ # No need to relocate ImageMagick is v6, or same soname %global move 0 +%global gh_vend ImageMagick +%global gh_proj ImageMagick +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag %{VER}-%{Patchlevel} + %if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 Name: %{libname} %else @@ -65,10 +70,14 @@ Url: https://imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz #Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz #Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz -Source0: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz -Source1: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc -Source2: ImageMagick.keyring +#Source0: https://imagemagick.org/archive/releases/%%{libname}-%%{VER}-%%{Patchlevel}.tar.xz +#Source1: https://imagemagick.org/archive/releases/%%{libname}-%%{VER}-%%{Patchlevel}.tar.xz.asc +#Source2: ImageMagick.keyring +%forgemeta +Source0: %{forgesource} +# to revert +Patch0: 0001-Fix-8819-revert-soname-change.patch BuildRequires: gnupg2 BuildRequires: autoconf automake make @@ -361,8 +370,10 @@ however. %prep -%{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}} -%setup -q -n %{libname}-%{VER}-%{Patchlevel} +# %{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}} +%forgesetup + +%patch -P0 -p1 -b .soname # for %%doc mkdir Magick++/examples @@ -620,6 +631,13 @@ fi %changelog +* Wed Jun 24 2026 Remi Collet <remi@remirepo.net> - 7.1.2-26-1 +- update to version 7.1.2 patch level 26 +- sources from github +- drop GPG signature check +- open https://github.com/ImageMagick/ImageMagick/issues/8819 soname change +- fix soname using patch from https://github.com/ImageMagick/ImageMagick/pull/8820 + * Fri Jun 5 2026 Remi Collet <remi@remirepo.net> - 7.1.2-25-1 - update to version 7.1.2 patch level 25 |