From 61879e7dcd9f888d2eb54d7fbd08b8351af97c64 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 17 Dec 2021 20:14:26 -0800 Subject: [PATCH 1/3] Update to 6.9.12-32 (#2029637) --- ImageMagick.spec | 140 +++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 1f4dfc9..1dc0646 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,55 +1,55 @@ %global VER 6.9.12 %global Patchlevel 32 -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) -%if 0%{?fedora} > 34 +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 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 +68,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 @@ -163,28 +163,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 +210,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,7 +323,7 @@ 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 +* Mon Dec 06 2021 Luya Tshimbalanga - 1:6.9.12.32-1 - Update to 6.9.12-32 (#2029637) * Tue Nov 23 2021 Sérgio Basto - 1:6.9.12-31 @@ -676,9 +676,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. @@ -716,7 +716,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 @@ -776,7 +776,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) @@ -860,9 +860,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 From 1ee7a0a214405da1f6cced09f55d37b881558297 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 28 Mar 2022 08:46:03 -0700 Subject: [PATCH 2/3] 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 cb6d78d..ca6b36a 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 33d3a315e46e66a56d8f28208351b8e41bc7354f Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 28 Mar 2022 19:14:51 -0700 Subject: [PATCH 3/3] New upstream release 6.9.12.44 --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index ca6b36a..e5d7776 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}.*