From 3c2579921028e01d1c9ed0d3d1bc7aa63b7c5e55 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 8 Dec 2021 21:39:08 -0800 Subject: [PATCH 1/8] Update to 6.9.12-32 (#2029637) --- .gitignore | 1 + ImageMagick.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 02a3c78..4f34b44 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ImageMagick-6.9.12-28.tar.xz /ImageMagick-6.9.12-30.tar.xz /ImageMagick-6.9.12-31.tar.xz +/ImageMagick-6.9.12-32.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index b17b6c3..1f4dfc9 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VER 6.9.12 -%global Patchlevel 31 +%global Patchlevel 32 Name: ImageMagick %if 0%{?fedora} >= 27 @@ -323,6 +323,9 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Dec 06 2021 Luya Tshimbalanga - 1:6.9.12-32 +- Update to 6.9.12-32 (#2029637) + * Tue Nov 23 2021 Sérgio Basto - 1:6.9.12-31 - Update ImageMagick to 6.9.12-31 (#2025909) diff --git a/sources b/sources index 26de924..cc440d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-31.tar.xz) = 9c89fbe6e6cae651d9559ee6e89370a0bc3316ef9af14917ca138a12e5d2bd99a7ad2b528c7ba52d808bfe4cc5a98ecf728bf3d813c34bd032a073bac2d81220 +SHA512 (ImageMagick-6.9.12-32.tar.xz) = 4bd560eb5097ec450b166698298558ef73d05c122ec837086e4de51f991ccf4a6eaf8996df2b856bc352d8a9ca329819f0d49eaaa791df75b3a85f7da4560119 From 6d0a93977cc3de85fb6a4d61855742de3e5cbf99 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 29 Jan 2022 20:55:42 -0800 Subject: [PATCH 2/8] Update to 6.9.12.37 (#2034280) --- .gitignore | 1 + ImageMagick.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f34b44..237b74b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ImageMagick-6.9.12-30.tar.xz /ImageMagick-6.9.12-31.tar.xz /ImageMagick-6.9.12-32.tar.xz +/ImageMagick-6.9.12-37.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index 1f4dfc9..a7c28cc 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VER 6.9.12 -%global Patchlevel 32 +%global Patchlevel 37 Name: ImageMagick %if 0%{?fedora} >= 27 @@ -323,6 +323,9 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Sat Jan 29 2022 Luya Tshimbalanga - 1:6.9.12.37-1 +- Update to 6.9.12.37 (#2034280) + * 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 cc440d2..4d050b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-32.tar.xz) = 4bd560eb5097ec450b166698298558ef73d05c122ec837086e4de51f991ccf4a6eaf8996df2b856bc352d8a9ca329819f0d49eaaa791df75b3a85f7da4560119 +SHA512 (ImageMagick-6.9.12-37.tar.xz) = 10f71d920849ce0cb55efe4c19e1b627f3e76352ba4d748ba57ead3eabce0697f6ce0ba710ad17349b791ab407b16cda5372d35bd18c0e0c3bc052debabae2f1 From 860d843dc7cc2e3aaf83ab062a822d4b3c6cea45 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 18 Feb 2022 23:18:31 -0800 Subject: [PATCH 3/8] New upstream release 6.9.12-40 (#2051040) --- .gitignore | 1 + ImageMagick.spec | 159 ++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 84 insertions(+), 78 deletions(-) diff --git a/.gitignore b/.gitignore index 237b74b..4daa392 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ImageMagick-6.9.12-31.tar.xz /ImageMagick-6.9.12-32.tar.xz /ImageMagick-6.9.12-37.tar.xz +/ImageMagick-6.9.12-40.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index a7c28cc..07d8481 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,55 +1,57 @@ %global VER 6.9.12 -%global Patchlevel 37 +%global Patchlevel 40 +# Disable automatic .la file removal +%global __brp_remove_la_files %nil -Name: ImageMagick +Name: ImageMagick %if 0%{?fedora} >= 27 # ImageMagick 7 was briefly sent to Fedora 27 and Rawhide in 2017; # the epoch was necessary to downgrade them back to 6. -Epoch: 1 +Epoch: 1 %else -Epoch: 0 +Epoch: 0 %endif -Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} -Summary: An X application for displaying and manipulating images +Version: %{VER}.%{Patchlevel} +Release: 1%{?dist} +Summary: An X application for displaying and manipulating images -License: ImageMagick -Url: https://legacy.imagemagick.org/ -Source0: https://www.imagemagick.org/download/%{name}-%{VER}-%{Patchlevel}.tar.xz +License: ImageMagick +Url: https://legacy.imagemagick.org/ +Source0: https://www.imagemagick.org/download/%{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 -BuildRequires: perl-generators +BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 +BuildRequires: perl-generators %if 0%{?fedora} > 27 -BuildRequires: libgs-devel, ghostscript-x11 +BuildRequires: libgs-devel, ghostscript-x11 %else -BuildRequires: ghostscript-devel +BuildRequires: ghostscript-devel %endif -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) +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 BuildRequires: pkgconfig(OpenEXR) %else -BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 +BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 %endif -BuildRequires: pkgconfig(fftw3), pkgconfig(libwebp) -BuildRequires: jbigkit-devel -BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 -BuildRequires: pkgconfig(libcgraph) >= 2.9.0 -BuildRequires: pkgconfig(raqm) -BuildRequires: pkgconfig(lqr-1) -BuildRequires: pkgconfig(libraw) >= 0.14.8 -BuildRequires: autoconf automake gcc gcc-c++ +BuildRequires: pkgconfig(fftw3), pkgconfig(libwebp) +BuildRequires: jbigkit-devel +BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 +BuildRequires: pkgconfig(libcgraph) >= 2.9.0 +BuildRequires: pkgconfig(raqm) +BuildRequires: pkgconfig(lqr-1) +BuildRequires: pkgconfig(libraw) >= 0.14.8 +BuildRequires: autoconf automake gcc gcc-c++ BuildRequires: make -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description ImageMagick is an image display and manipulation tool for the X @@ -68,9 +70,9 @@ ImageMagick-devel as well. %package devel -Summary: Library links and header files for ImageMagick app development -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Summary: Library links and header files for ImageMagick app development +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel ImageMagick-devel contains the library links and header files you'll @@ -110,9 +112,9 @@ http://www.imagemagick.org/ %package perl -Summary: ImageMagick perl bindings -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Summary: ImageMagick perl bindings +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings to ImageMagick. @@ -122,8 +124,8 @@ ImageMagick. %package c++ -Summary: ImageMagick Magick++ library (C++ bindings) -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Summary: ImageMagick Magick++ library (C++ bindings) +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description c++ This package contains the Magick++ library, a C++ binding to the ImageMagick @@ -133,9 +135,9 @@ Install ImageMagick-c++ if you want to use any applications that use Magick++. %package c++-devel -Summary: C++ bindings for the ImageMagick library -Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} +Summary: C++ bindings for the ImageMagick library +Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} %description c++-devel ImageMagick-devel contains the static libraries and header files you'll @@ -163,28 +165,28 @@ autoconf -f -i # Reduce thread contention, upstream sets this flag for Linux hosts export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" %configure \ - --enable-shared \ - --disable-static \ - --with-modules \ - --with-perl \ - --with-x \ - --with-threads \ - --with-magick_plus_plus \ - --with-gslib \ - --with-wmf \ - --with-webp \ - --with-openexr \ - --with-rsvg \ - --with-xml \ - --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ - --without-dps \ - --without-gcc-arch \ - --with-jbig \ - --with-openjp2 \ - --with-raw \ - --with-lqr \ - --with-gvc \ - --with-raqm + --enable-shared \ + --disable-static \ + --with-modules \ + --with-perl \ + --with-x \ + --with-threads \ + --with-magick_plus_plus \ + --with-gslib \ + --with-wmf \ + --with-webp \ + --with-openexr \ + --with-rsvg \ + --with-xml \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ + --without-dps \ + --without-gcc-arch \ + --with-jbig \ + --with-openjp2 \ + --with-raw \ + --with-lqr \ + --with-gvc \ + --with-raqm # Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild make @@ -210,14 +212,14 @@ find %{buildroot} -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root,-)" > perl-pkg-files find %{buildroot}/%{_libdir}/perl* -type f -print \ - | sed "s@^%{buildroot}@@g" > perl-pkg-files + | sed "s@^%{buildroot}@@g" > perl-pkg-files find %{buildroot}%{perl_vendorarch} -type d -print \ - | sed "s@^%{buildroot}@%dir @g" \ - | grep -v '^%dir %{perl_vendorarch}$' \ - | grep -v '/auto$' >> perl-pkg-files + | sed "s@^%{buildroot}@%dir @g" \ + | grep -v '^%dir %{perl_vendorarch}$' \ + | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then - echo "ERROR: EMPTY FILE LIST" - exit -1 + echo "ERROR: EMPTY FILE LIST" + exit -1 fi # fix multilib issues: Rename provided file with platform-bits in name. @@ -323,6 +325,9 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Thu Feb 17 2022 Luya Tshimbalanga - 1:6.9.12.40-1 +- New upstream release 6.9.12-40 (#2051040) + * Sat Jan 29 2022 Luya Tshimbalanga - 1:6.9.12.37-1 - Update to 6.9.12.37 (#2034280) @@ -679,9 +684,9 @@ rm PerlMagick/demo/Generic.ttf * Wed Jun 12 2013 Pavel Alexeev - 6.5.5.10-1 - Update to 6.8.5-10 upstream version (bz#720285). - By Remi Collet request (bz#969760) enable those features in ImageMagick: - --with-lcms2 (instead of --with-lcms): lcms2-devel - --with-openexr: OpenEXR-devel - --with-webp: libwebp-devel + --with-lcms2 (instead of --with-lcms): lcms2-devel + --with-openexr: OpenEXR-devel + --with-webp: libwebp-devel * Thu Apr 18 2013 Pavel Alexeev - 6.8.3.9-2 - Enable fftw to do Fourier transforms (add BuildRequires: fftw-devel) - bz#950254 by Søren Sandmann Pedersen request. @@ -719,7 +724,7 @@ rm PerlMagick/demo/Generic.ttf * Tue Apr 10 2012 Pavel Alexeev - 6.7.6.5-1 - Update to 6.7.6.5 to fix security issues: bz#807993, bz#807994, bz#807997, - bz#808159, bz#804591, bz#804588 + bz#808159, bz#804591, bz#804588 * Sat Feb 25 2012 Pavel Alexeev - 6.7.5.6-1 - Update by request https://bugzilla.redhat.com/show_bug.cgi?id=755827#c8 @@ -779,7 +784,7 @@ rm PerlMagick/demo/Generic.ttf * Fri Jul 30 2010 Pavel Alexeev - 6.6.2.1-12 - Add %%doc LICENSE as it required new Licensing Guidelines Update - ( https://fedoraproject.org/wiki/Packaging:LicensingGuidelines ) + ( https://fedoraproject.org/wiki/Packaging:LicensingGuidelines ) * Wed Jun 23 2010 Mamoru Tasaka - 6.6.2.1-11 - Rebuild (to fix downgrade after perl-5.12.0-rebuild tag) @@ -863,9 +868,9 @@ rm PerlMagick/demo/Generic.ttf * Sun Jul 27 2008 Hans de Goede 6.4.0.10-2 - Fix ownership of /usr/include/ImageMagick (bz 444647) - By Remi request (bz#969760) enable those features in ImageMagick: - --with-lcms2 (instead of --with-lcms): lcms2-devel - --with-openexr: OpenEXR-devel - --with-webp: libwebp-devel + --with-lcms2 (instead of --with-lcms): lcms2-devel + --with-openexr: OpenEXR-devel + --with-webp: libwebp-devel * Sat Apr 26 2008 Hans de Goede 6.4.0.10-1 - New upstream release 6.4.0.10 diff --git a/sources b/sources index 4d050b7..18fc5ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-37.tar.xz) = 10f71d920849ce0cb55efe4c19e1b627f3e76352ba4d748ba57ead3eabce0697f6ce0ba710ad17349b791ab407b16cda5372d35bd18c0e0c3bc052debabae2f1 +SHA512 (ImageMagick-6.9.12-40.tar.xz) = e5827474ea0013016508766e14e9fb80ec0c77e228d59b56bdc1a04de06e3c453760d85a6ac6bfef065dcc87ce5f857d7443460fc6dd56970a363aeb3a42c84e From f953f1b4089336ca288f8539a85ed6699be14201 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 23 Mar 2022 16:53:50 -0700 Subject: [PATCH 4/8] New upstream release 6.9.12.43 --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 07d8481..a1c0be5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -257,7 +257,7 @@ rm PerlMagick/demo/Generic.ttf %ldconfig_scriptlets c++ %files -%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt ChangeLog +%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt ChangeLog.md %{_bindir}/[a-z]* %{_mandir}/man[145]/[a-z]* %{_mandir}/man1/%{name}.* From 5684a24d658388c6e5f3ac10956754f92e2c396c Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 28 Mar 2022 08:46:03 -0700 Subject: [PATCH 5/8] New upstream release 6.9.12.44 --- .gitignore | 3 +++ ImageMagick.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4daa392..a0f583f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /ImageMagick-6.9.12-32.tar.xz /ImageMagick-6.9.12-37.tar.xz /ImageMagick-6.9.12-40.tar.xz +/ImageMagick-6.9.12-42.tar.xz +/ImageMagick-6.9.12-43.tar.xz +/ImageMagick-6.9.12-44.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index a1c0be5..614f278 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VER 6.9.12 -%global Patchlevel 40 +%global Patchlevel 44 # Disable automatic .la file removal %global __brp_remove_la_files %nil @@ -325,6 +325,15 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Mar 28 2022 Luya Tshimbalanga - 1:6.9.12.44-1 +- New upstream release 6.9.12.44 + +* Wed Mar 23 2022 Luya Tshimbalanga - 1:6.9.12.43-1 +- New upstream release 6.9.12.43 + +* Tue Mar 15 2022 Luya Tshimbalanga - 1:6.9.12.42-1 +- New upstream release 6.9.12.42 + * Thu Feb 17 2022 Luya Tshimbalanga - 1:6.9.12.40-1 - New upstream release 6.9.12-40 (#2051040) diff --git a/sources b/sources index 18fc5ae..11b948f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-40.tar.xz) = e5827474ea0013016508766e14e9fb80ec0c77e228d59b56bdc1a04de06e3c453760d85a6ac6bfef065dcc87ce5f857d7443460fc6dd56970a363aeb3a42c84e +SHA512 (ImageMagick-6.9.12-44.tar.xz) = cf0c34796d4250296d55782931743bc396fd1485c5b638b6de6f7bc5d16048e6cddbb4b17f5c98d604c7af7f13217c31d57f39087d8a2c761aed8703f41e0993 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 6/8] 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 From 695ba48c451c1210d6880c62fbbc63c383ab6318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 8 May 2022 03:40:17 +0100 Subject: [PATCH 7/8] delete unused patch --- ...ved-swapping-to-the-correct-position.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch diff --git a/ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch b/ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch deleted file mode 100644 index 36379ef..0000000 --- a/ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 112051a709f83f13ca2b9ab63007d4a41b0a9beb Mon Sep 17 00:00:00 2001 -From: Dirk Lemstra -Date: Sun, 22 Nov 2020 18:11:37 +0100 -Subject: [PATCH] Moved swapping to the correct position. - ---- - coders/tiff.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/coders/tiff.c b/coders/tiff.c -index dba08138c8..fff2e79d4c 100644 ---- a/coders/tiff.c -+++ b/coders/tiff.c -@@ -640,12 +640,13 @@ static MagickBooleanType TIFFGetProfiles(TIFF *tiff,Image *image) - { - const TIFFField - *field; -- -- if (TIFFIsByteSwapped(tiff) != 0) -- TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length); - field=TIFFFieldWithTag(tiff,TIFFTAG_RICHTIFFIPTC); - if (TIFFFieldDataType(field) == TIFF_LONG) -- status=ReadProfile(image,"iptc",profile,4L*length); -+ { -+ if (TIFFIsByteSwapped(tiff) != 0) -+ TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length); -+ status=ReadProfile(image,"iptc",profile,4L*length); -+ } - else - status=ReadProfile(image,"iptc",profile,length); - } From 7c7fdf7de3fc84789f87d623d62b81a70eb04f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 May 2022 01:44:48 +0100 Subject: [PATCH 8/8] Update ImageMagick to 6.9.12.50 (#2087046) --- .gitignore | 1 + ImageMagick.spec | 40 ++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0359124..cdfa531 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ImageMagick-6.9.12-43.tar.xz /ImageMagick-6.9.12-44.tar.xz /ImageMagick-6.9.12-48.tar.xz +/ImageMagick-6.9.12-50.tar.xz diff --git a/ImageMagick.spec b/ImageMagick.spec index 9d1451a..a73f3e6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -9,7 +9,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 6.9.12.48 +Version: 6.9.12.50 Release: 1%{?dist} Summary: An X application for displaying and manipulating images @@ -19,15 +19,10 @@ License: ImageMagick Url: https://legacy.imagemagick.org/ 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 - BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 BuildRequires: perl-generators -%if 0%{?fedora} > 27 +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 BuildRequires: libgs-devel, ghostscript-x11 %else BuildRequires: ghostscript-devel @@ -36,7 +31,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 || 0%{?epel} > 8 +%if 0%{?fedora} > 34 || 0%{?rhel} > 8 BuildRequires: pkgconfig(OpenEXR) %else BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 @@ -48,10 +43,14 @@ BuildRequires: pkgconfig(libcgraph) >= 2.9.0 BuildRequires: pkgconfig(raqm) BuildRequires: pkgconfig(lqr-1) BuildRequires: pkgconfig(libraw) >= 0.14.8 +BuildRequires: pkgconfig(libzstd) BuildRequires: autoconf automake gcc gcc-c++ BuildRequires: make Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +# allow smoth upgrade for 3rd party repository +# providing latest version/soname as ImageMagick6 +Obsoletes: %{name}6 <= %{epoch}:%{version}-%{release} %description ImageMagick is an image display and manipulation tool for the X @@ -73,6 +72,7 @@ ImageMagick-devel as well. Summary: Library links and header files for ImageMagick app development Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: %{name}6-devel <= %{epoch}:%{version}-%{release} %description devel ImageMagick-devel contains the library links and header files you'll @@ -87,6 +87,7 @@ however. %package libs Summary: ImageMagick libraries to link with +Obsoletes: %{name}6-libs <= %{epoch}:%{version}-%{release} %description libs This packages contains a shared libraries to use within other applications. @@ -95,6 +96,7 @@ This packages contains a shared libraries to use within other applications. %package djvu Summary: DjVu plugin for ImageMagick Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: %{name}6-djvu <= %{epoch}:%{version}-%{release} %description djvu This packages contains a plugin for ImageMagick which makes it possible to @@ -103,6 +105,7 @@ save and load DjvU files from ImageMagick and libMagickCore using applications. %package doc Summary: ImageMagick html documentation +Obsoletes: %{name}6-doc <= %{epoch}:%{version}-%{release} %description doc ImageMagick documentation, this package contains usage (for the @@ -115,6 +118,7 @@ http://www.imagemagick.org/ Summary: ImageMagick perl bindings Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Obsoletes: %{name}6-perl <= %{epoch}:%{version}-%{release} %description perl Perl bindings to ImageMagick. @@ -126,6 +130,7 @@ ImageMagick. %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: %{name}6-c++ <= %{epoch}:%{version}-%{release} %description c++ This package contains the Magick++ library, a C++ binding to the ImageMagick @@ -138,6 +143,7 @@ Install ImageMagick-c++ if you want to use any applications that use Magick++. Summary: C++ bindings for the ImageMagick library Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: %{name}6-c++-devel <= %{epoch}:%{version}-%{release} %description c++-devel ImageMagick-devel contains the static libraries and header files you'll @@ -188,6 +194,9 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" --with-gvc \ --with-raqm +# shoud we enable hdri ? +# --enable-hdri + # Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild make @@ -325,6 +334,21 @@ rm PerlMagick/demo/Generic.ttf %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Sun May 29 2022 Sérgio Basto - 1:6.9.12.50-1 +- Update ImageMagick to 6.9.12.50 (#2087046) + +* Fri May 20 2022 Sandro Mani - 1:6.9.12.48-4 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + +* Mon May 16 2022 Sérgio Basto - 1:6.9.12.48-3 +- Don't use the %{?eln} macro, you should use %{?rhel} recommended by Stephen + Gallagher + +* Sun May 08 2022 Sérgio Basto - 1:6.9.12.48-2 +- Support eln +- add support libzst +- should we enable hdri ? + * 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 diff --git a/sources b/sources index e03d4ff..80be4e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.12-48.tar.xz) = f9a140c2505626015e8149ebb19e9329158295d27b404061e5c0514affd2284fe847bca71e5786b386fe162f417cc317c2831f7c56f9da4154c94bbba74972f0 +SHA512 (ImageMagick-6.9.12-50.tar.xz) = b135dd0b1f2fc3142bd1b7ebbf03125233bb8c079070059ceeb9af79d1eaf9079d3580a53338e0df201edcd403b46683b01010d587d0c952b5060a21e5bb46be