diff --git a/ImageMagick-7.1.1-29.tar.xz b/ImageMagick-7.1.1-29.tar.xz deleted file mode 100644 index 53c8b48..0000000 --- a/ImageMagick-7.1.1-29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685 -size 10612124 diff --git a/ImageMagick-7.1.1-29.tar.xz.asc b/ImageMagick-7.1.1-29.tar.xz.asc deleted file mode 100644 index 6022ef4..0000000 --- a/ImageMagick-7.1.1-29.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmXbWjgACgkQiatj1IJ3 -N3qSCA/+ONC4mKQXW6Ak2p4HAkIJz9iLu3MsiKfoPEATNaca+Iu0ud3Td1WYRQa4 -jG8xYlBMpQsAlgUT+Bj1VHNqACAt3j/Vd/1HVErydAxDEtwjIk6kM/+FDAEMa5u1 -aQsDlekd9HIA4tSZpEUtkQJaTrY5IvMClhwZvj5j9hOpKTlARO6qbVOCpmYdGGlW -Awa+nX98A6ftqBgxIa4cIuYcItNLAcpD0Tat9KKHiEY7IvxvajCSGHO5Pb0pLBny -UPd+Z6Ywpn8lBYSAtnYlm+0MPCgJVJwn8F6/4rJ39cMp2xWu9Eu5appTGSGbfbQf -ApNikiSjSlNdRbin6vmcJUXpaaKdZP5vB51qYokUhJuLwpsie3Ritl1HNZEEdqw4 -eJkeYZuQiLYX2HMudJ22UFj4k9SD1DPgjaJ9TR/eKyHsHDDmbJ8ql4IIuB7ss+wd -fTdPrCptDH9XM6xLzQ0CNTYNVw1GAjG8fVjCBJX9n1cGxg6qsfiWbvdLVTOvZN/R -z0vvRwLVTQy0z8EEl7lQD2FrRH8nQiGPXg8xq2rULB0ZRoeEsNT+sOBcUsgLk3hS -EPJqp/YjyPY60X+Hh8stZq6Yyn9wiMZcKQklyFj39i8fNgBbKEvfhHCSTdINyecc -Syk30ovTyHlKwIwDGTs8EwOphgkwLst3pB+Tfi6hdc5C7zaw7YY= -=Tg17 ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-30.tar.xz b/ImageMagick-7.1.1-30.tar.xz new file mode 100644 index 0000000..54201f0 --- /dev/null +++ b/ImageMagick-7.1.1-30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec192780d09da7d7b1e7a374a19f97d69cceb4e5e83057515cd595eda233a891 +size 10791844 diff --git a/ImageMagick-7.1.1-30.tar.xz.asc b/ImageMagick-7.1.1-30.tar.xz.asc new file mode 100644 index 0000000..290af93 --- /dev/null +++ b/ImageMagick-7.1.1-30.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmYTOF8ACgkQiatj1IJ3 +N3re6Q//dUxUzhp6TAwaKtE+hIdDNJ/a/8X5te45hxEPa4h/SzRu9VVpahLytE6n +cHje+HH7fCQjP8P0eFRQTmHNDZNLHJFHi61JaAlJjIsu/VdQWTG7Yeqh6EnRLQnj +13OKIhDD+dY+WmQTzhOn4+YrOsbsfUrg5HL4mAWGPVuTa5zol2sNY5WesRUTHKB1 +F9QtRQsON6Q3nBvMAF9zF4M4nCzxTVCPQbohj91II9vK7ciqVdFdsK/9/eXGx978 +GVlsivyjU56wITp8jfK24WlnZVh7yDHNBExeSA9sGoLddWKtXqFIGwxKF7YxmsPn +e6Y7uJZQcjuD2d703luAeGPCS+4bQrCUBY/HkB7sIkAbMdU33ijwVVPXSTP77jot +bvuuxz6G8o0+JkSUWOOl+9MIrfq2uJf8V4t6GDMa0rhs1dA+aVrbAB0HO6CXJFD1 +uXixX0byy68lKgqgDO7b22N5vYzY+uCDX0lsvfk4A9ucfodVWlEmNQJ/xedCgty1 +CycgrlmNfiZy0V6IjzYkyc3ZFPV1qEYLIDxbIC2qq9eTMHsrcofLy695/8SzEjcj +bPy0MV0zZg/1QVFQiw9HtgzuFjCfOt+3bzZaEamnW2P9RCaKF9cFByG7+Fl5JrSt +uTDItkRLHXjB1c8HVrkOSJzStOCpPeZOgeFkMbCOBHYj2B+QGrs= +=bfPU +-----END PGP SIGNATURE----- diff --git a/ImageMagick-revert.patch b/ImageMagick-revert.patch new file mode 100644 index 0000000..81b114f --- /dev/null +++ b/ImageMagick-revert.patch @@ -0,0 +1,13 @@ +Index: ImageMagick-7.1.1-30/PerlMagick/Makefile.PL.in +=================================================================== +--- ImageMagick-7.1.1-30.orig/PerlMagick/Makefile.PL.in ++++ ImageMagick-7.1.1-30/PerlMagick/Makefile.PL.in +@@ -224,7 +224,7 @@ WriteMakefile + 'LDDLFLAGS' => $LDDLFLAGS_magick, + + # Install PerlMagick into ImageMagick prefix +- 'INSTALL_BASE' => '@PREFIX_DIR@', ++ #'INSTALL_BASE' => '@PREFIX_DIR@', + + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', diff --git a/ImageMagick.changes b/ImageMagick.changes index 9c84d71..04fc9d2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 8 14:44:40 UTC 2024 - pgajdos@suse.com + +- version update to 7.1.1.30 + * install perl module into user-specified prefix by @bugfood in #7192 + * Fix bmp option to bypass file size check by @OnTheList-1 in #7194 + * add support for encoding/decoding ultrahdr images by @aayushsoni111 in #7198 + * Bump azure/azure-code-signing-action from 0.3.0 to 0.3.1 by @dependabot in #7206 + * Updates to uhdr.c by @aayushsoni111 in #7217 + ------------------------------------------------------------------- Fri Mar 22 10:32:38 UTC 2024 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 2186f30..b9c6897 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 29 +%define mfr_revision 30 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -53,6 +53,8 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch #%%endif #%%ifarch s390x Patch5: ImageMagick-s390x-disable-tests.patch +# revert https://github.com/ImageMagick/ImageMagick/pull/7192 +Patch6: ImageMagick-revert.patch #%%endif BuildRequires: chrpath BuildRequires: dejavu-fonts @@ -274,6 +276,7 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x %patch -P 5 -p1 %endif +%patch6 -p1 %build # bsc#1088463