From b3e067ad34ccce28266a1699086f852c62ad6c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 8 May 2022 03:35:32 +0100 Subject: [PATCH] Update ImageMagick to 6.9.12.48 Change the way of calculte VER and Patchlevel which will fix the-new-hotness/release-monitoring.org's scratch build --- .gitignore | 1 + ImageMagick.spec | 27 +++++++++++++++++++-------- sources | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a0f583f..0359124 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ImageMagick-6.9.12-42.tar.xz /ImageMagick-6.9.12-43.tar.xz /ImageMagick-6.9.12-44.tar.xz +/ImageMagick-6.9.12-48.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index 614f278..9d1451a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,3 @@ -%global VER 6.9.12 -%global Patchlevel 44 # Disable automatic .la file removal %global __brp_remove_la_files %nil @@ -11,18 +9,20 @@ Epoch: 1 %else Epoch: 0 %endif -Version: %{VER}.%{Patchlevel} +Version: 6.9.12.48 Release: 1%{?dist} Summary: An X application for displaying and manipulating images +%global VER %(foo=%{version}; echo ${foo:0:6}) +%global Patchlevel %(foo=%{version}; echo ${foo:7}) License: ImageMagick Url: https://legacy.imagemagick.org/ -Source0: https://www.imagemagick.org/download/%{name}-%{VER}-%{Patchlevel}.tar.xz +Source0: https://www.imagemagick.org/download/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz # Fix segfaults on s390x with rubygem-acitvestorage test suite. # https://bugzilla.redhat.com/show_bug.cgi?id=1993193 # https://github.com/ImageMagick/ImageMagick6/commit/112051a709f83f13ca2b9ab63007d4a41b0a9beb -#Patch0: ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch +#Patch0: ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(libwmf), pkgconfig(jasper), libtool-ltdl-devel BuildRequires: pkgconfig(x11), pkgconfig(xext), pkgconfig(xt) BuildRequires: pkgconfig(lcms2), pkgconfig(libxml-2.0), pkgconfig(librsvg-2.0) -%if 0%{?fedora} > 34 +%if 0%{?fedora} > 34 || 0%{?epel} > 8 BuildRequires: pkgconfig(OpenEXR) %else BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 @@ -257,7 +257,7 @@ rm PerlMagick/demo/Generic.ttf %ldconfig_scriptlets c++ %files -%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt ChangeLog.md +%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt %{_bindir}/[a-z]* %{_mandir}/man[145]/[a-z]* %{_mandir}/man1/%{name}.* @@ -325,6 +325,10 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Sun May 08 2022 Sérgio Basto - 1:6.9.12.48-1 +- Update ImageMagick to 6.9.12.48 +- Change the way of calculte VER and Patchlevel which will fix the-new-hotness/release-monitoring.org's scratch build + * Mon Mar 28 2022 Luya Tshimbalanga - 1:6.9.12.44-1 - New upstream release 6.9.12.44 @@ -339,7 +343,14 @@ rm PerlMagick/demo/Generic.ttf * Sat Jan 29 2022 Luya Tshimbalanga - 1:6.9.12.37-1 - Update to 6.9.12.37 (#2034280) - + +* Mon Jan 24 2022 Timm Bäder - 1:6.9.12.32-3 +- Disable automatic .la file removal +- https://fedoraproject.org/wiki/Changes/RemoveLaFiles + +* Wed Jan 19 2022 Fedora Release Engineering - 1:6.9.12.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 06 2021 Luya Tshimbalanga - 1:6.9.12-32 - Update to 6.9.12-32 (#2029637) diff --git a/sources b/sources index 11b948f..e03d4ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-44.tar.xz) = cf0c34796d4250296d55782931743bc396fd1485c5b638b6de6f7bc5d16048e6cddbb4b17f5c98d604c7af7f13217c31d57f39087d8a2c761aed8703f41e0993 +SHA512 (ImageMagick-6.9.12-48.tar.xz) = f9a140c2505626015e8149ebb19e9329158295d27b404061e5c0514affd2284fe847bca71e5786b386fe162f417cc317c2831f7c56f9da4154c94bbba74972f0