diff --git a/.ImageMagick.metadata b/.ImageMagick.metadata new file mode 100644 index 0000000..077b766 --- /dev/null +++ b/.ImageMagick.metadata @@ -0,0 +1 @@ +5f38c8c0d00a400d4f47ac4e0af050adf998f42c SOURCES/ImageMagick-7.1.1-43.tar.xz diff --git a/.gitignore b/.gitignore index 32640c0..f04fc6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1 @@ -/ImageMagick-6.9.10-86.tar.xz -/ImageMagick-6.9.11-27.tar.xz -/ImageMagick-7.1.0-10.tar.xz -/ImageMagick-6.9.12-25.tar.xz -/ImageMagick-6.9.12-27.tar.xz -/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 -/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 -/ImageMagick-6.9.12-48.tar.xz -/ImageMagick-6.9.12-50.tar.xz -/ImageMagick-6.9.12-52.tar.xz -/ImageMagick-6.9.12-58.tar.xz -/ImageMagick-6.9.12-61.tar.xz -/ImageMagick-6.9.12-62.tar.xz -/ImageMagick-6.9.12-63.tar.xz -/ImageMagick-6.9.12-64.tar.xz -/ImageMagick-6.9.12-67.tar.xz -/ImageMagick-6.9.12-70.tar.xz -/ImageMagick-6.9.12-77.tar.xz -/ImageMagick-6.9.12-82.tar.xz -/ImageMagick-6.9.12-86.tar.xz -/ImageMagick-6.9.12-93.tar.xz -/ImageMagick-6.9.13-14.tar.xz -/ImageMagick-6.9.13-17.tar.xz +SOURCES/ImageMagick-7.1.1-43.tar.xz diff --git a/SOURCES/ImageMagick-7.1.1-43.tar.xz.asc b/SOURCES/ImageMagick-7.1.1-43.tar.xz.asc new file mode 100644 index 0000000..30efb4c --- /dev/null +++ b/SOURCES/ImageMagick-7.1.1-43.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmdoeJIACgkQiatj1IJ3 +N3rgoRAAph8B3N6Ssar9NhlOPJ5QlUIjTkBkh/psvKlvYuYAc7g00pQrDdqvnyqn ++hWwX4s49RP2nxfTx1A7HNaWyOw/xhaV/24FLdadw1HP2SelkX2aad1SDjvUMKA1 +PGaK7v3/V6krCZINW3Yq7Rm3aN/gRxm428YY2yO5N7GBi5KhdcImOcNdLpZzq9Jw +mr9vXwK9ax/5wop3VAF724qlSNOACS9EqM/Yk+YdGg/ZruVmuVrWG91ySSWzBqSq +wNwKympBQwZeOkEPd5rGNidFdrGKdym4gxcOp/cz/F0ThtFbQjI8A/3CPaRRKAPW +0EtigG8x++l5HSrgxXGqQtR+y+m3J2RJ4JdXThL89sZV/mWy3Gjq8YOSxViPm06H +DIaEDKEV6oK5a8bBs64/JGaKSmjQGqdcpS/FNTRt6OjSZSB+INdmIj19bt8P+WrW +mnMzskbDMvGpW2DKtqQdvQttiWdeJjUtc8hYUUeyA7dvBAMFyS4gJsvSx60IJF2l +Kom6fDBn3ZaFGQs1qyTMukONkKoxhwd4S9sTMhWNWrfGGzfyMpJrRA8BHBqc7naw +yP+ucV4+hYknN7JvuE8ju4PZ6Fyb4fF4TwsiRaN/5FcdBwCMAdNX8oit5PaOBt5u +Xe7mF8k81e5FKs4XyK0DZC2jALo8AIzGICxM5qGEeiGcecD00Ow= +=QK9r +-----END PGP SIGNATURE----- diff --git a/SOURCES/ImageMagick.keyring b/SOURCES/ImageMagick.keyring new file mode 100644 index 0000000..bcafbf0 --- /dev/null +++ b/SOURCES/ImageMagick.keyring @@ -0,0 +1,53 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.20 (GNU/Linux) + +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 +Ujew +=X6Ea +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ImageMagick.spec b/SPECS/ImageMagick.spec similarity index 82% rename from ImageMagick.spec rename to SPECS/ImageMagick.spec index 3d30c62..bd6abcd 100644 --- a/ImageMagick.spec +++ b/SPECS/ImageMagick.spec @@ -1,43 +1,68 @@ +%bcond_without tests + +%bcond_without libheif + +%if 0%{?flatpak} +%bcond_with perl +%else +%bcond_without perl +%endif + # Disable automatic .la file removal %global __brp_remove_la_files %nil 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 -%else -Epoch: 0 -%endif -Version: 6.9.13.17 +Version: 7.1.1.43 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}) +%global VER %(foo=%{version}; echo ${foo:0:5}) +%global Patchlevel %(foo=%{version}; echo ${foo:6}) +%global libsover 10 +%global subsover VERS_10.0 +%global libcxxsover 5 License: ImageMagick -Url: https://legacy.imagemagick.org/ -Source0: https://www.imagemagick.org/archive/%{name}-%{VER}-%{Patchlevel}.tar.xz - -BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng) -BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1 +URL: https://imagemagick.org/ +Source0: https://imagemagick.org/archive/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz +Source1: https://imagemagick.org/archive/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz.asc +Source2: ImageMagick.keyring + +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: giflib-devel +BuildRequires: pkgconfig(zlib) +%if %{with perl} +BuildRequires: perl-devel >= 5.8.1 BuildRequires: perl-generators -%if 0%{?fedora} > 27 || 0%{?rhel} > 7 -BuildRequires: libgs-devel, ghostscript-x11 -%else +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: ghostscript-devel +%else +BuildRequires: libgs-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 || 0%{?rhel} > 8 -BuildRequires: pkgconfig(OpenEXR) -%else +BuildRequires: pkgconfig(libwmf) +BuildRequires: pkgconfig(jasper) +BuildRequires: libtool-ltdl-devel +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(librsvg-2.0) +%if 0%{?rhel} && 0%{?rhel} < 9 BuildRequires: pkgconfig(IlmBase), pkgconfig(OpenEXR) < 2.5.6 +%else +BuildRequires: pkgconfig(OpenEXR) %endif -BuildRequires: pkgconfig(fftw3), pkgconfig(libwebp) +BuildRequires: pkgconfig(fftw3) +BuildRequires: pkgconfig(libwebp) BuildRequires: jbigkit-devel +BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 BuildRequires: pkgconfig(libcgraph) >= 2.9.0 BuildRequires: pkgconfig(raqm) @@ -46,13 +71,21 @@ BuildRequires: pkgconfig(lqr-1) %endif BuildRequires: pkgconfig(libraw) >= 0.14.8 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(libzip) >= 1.0.0 +BuildRequires: pkgconfig(pango) >= 1.28.1 +BuildRequires: pkgconfig(pangocairo) >= 1.28.1 +BuildRequires: urw-base35-fonts-devel BuildRequires: autoconf automake gcc gcc-c++ BuildRequires: make +BuildRequires: gnupg2 +# for doc +BuildRequires: doxygen 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} +# allow smooth upgrade for 3rd party repository +# providing latest version/soname as ImageMagick7 +Obsoletes: %{name}7 < %{epoch}:%{version}-%{release} +Provides: %{name}7 = %{epoch}:%{version}-%{release} %description ImageMagick is an image display and manipulation tool for the X @@ -74,7 +107,8 @@ 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} +Obsoletes: %{name}7-devel < %{epoch}:%{version}-%{release} +Provides: %{name}7-devel = %{epoch}:%{version}-%{release} %description devel ImageMagick-devel contains the library links and header files you'll @@ -89,7 +123,12 @@ however. %package libs Summary: ImageMagick libraries to link with -Obsoletes: %{name}6-libs <= %{epoch}:%{version}-%{release} +Obsoletes: %{name}7-libs < %{epoch}:%{version}-%{release} +Provides: %{name}7-libs = %{epoch}:%{version}-%{release} +# These may be used for some functions +Recommends: urw-base35-fonts +# default font is OpenSans-Regular +Recommends: open-sans-fonts %description libs This packages contains a shared libraries to use within other applications. @@ -98,16 +137,34 @@ 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} +Obsoletes: %{name}7-djvu < %{epoch}:%{version}-%{release} +Provides: %{name}7-djvu = %{epoch}:%{version}-%{release} %description djvu This packages contains a plugin for ImageMagick which makes it possible to save and load DjvU files from ImageMagick and libMagickCore using applications. +%if %{with libheif} +%package heic +Summary: HEIC plugin for ImageMagick +BuildRequires: pkgconfig(libheif) >= 1.4.0 +%if 0%{?rhel} == 7 +# ensure we use our on EL-7 +Requires: libheif%{?_isa} >= 1.4.0 +%endif +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} + +%description heic +This packages contains a plugin for ImageMagick which makes it possible to +save and load HEIC files from ImageMagick and libMagickCore using applications. +%endif + + %package doc Summary: ImageMagick html documentation -Obsoletes: %{name}6-doc <= %{epoch}:%{version}-%{release} +Obsoletes: %{name}7-doc < %{epoch}:%{version}-%{release} +Provides: %{name}7-doc = %{epoch}:%{version}-%{release} %description doc ImageMagick documentation, this package contains usage (for the @@ -116,23 +173,26 @@ Note this documentation can also be found on the ImageMagick website: http://www.imagemagick.org/ +%if %{with perl} %package perl 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} +Obsoletes: %{name}7-perl < %{epoch}:%{version}-%{release} +Provides: %{name}7-perl = %{epoch}:%{version}-%{release} %description perl Perl bindings to ImageMagick. Install ImageMagick-perl if you want to use any perl scripts that use ImageMagick. +%endif %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: %{name}6-c++ <= %{epoch}:%{version}-%{release} +Obsoletes: %{name}7-c++ < %{epoch}:%{version}-%{release} +Provides: %{name}7-c++ = %{epoch}:%{version}-%{release} %description c++ This package contains the Magick++ library, a C++ binding to the ImageMagick @@ -145,7 +205,8 @@ 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} +Obsoletes: %{name}7-c++-devel < %{epoch}:%{version}-%{release} +Provides: %{name}7-c++-devel = %{epoch}:%{version}-%{release} %description c++-devel ImageMagick-devel contains the static libraries and header files you'll @@ -161,55 +222,73 @@ however. %prep +%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0} %autosetup -p1 -n %{name}-%{VER}-%{Patchlevel} -# for %%doc -mkdir Magick++/examples -cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples - sed -e '/INSTALL_BASE/d' -i PerlMagick/Makefile.PL* - %build -autoconf -f -i +autoconf -f -i -v # 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 \ +%if %{with perl} --with-perl \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ +%endif --with-x \ --with-threads \ --with-magick_plus_plus \ --with-gslib \ + --with-pango \ + --with-fftw \ --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'" \ + --with-urw-base35-font-dir="%{urw_base35_fontpath}" \ --without-dps \ + --enable-openmp \ --without-gcc-arch \ --with-jbig \ + --with-jxl \ --with-openjp2 \ --with-raw \ %if 0%{?fedora} || 0%{?rhel} > 8 --with-lqr \ %endif --with-gvc \ - --with-raqm + --with-raqm \ +%if %{with libheif} + --with-heic \ +%endif # Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild make +# Generate API docs +make html-local %install %make_install -cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER} + +# Compatibility symlinks for headers for IM6->IM7 transition +ln -sr %{buildroot}%{_includedir}/%{name}-7/MagickCore %{buildroot}%{_includedir}/%{name}-7/magick +ln -sr %{buildroot}%{_includedir}/%{name}-7/MagickWand %{buildroot}%{_includedir}/%{name}-7/wand + +# Do NOT remove .la files for codecs +# https://bugzilla.opensuse.org/show_bug.cgi?id=579798 # Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! rm %{buildroot}%{_libdir}/*.la +%if %{with perl} +# fix weird perl module permissions +chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Q16HDRI/Q16HDRI.so + # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl @@ -218,11 +297,7 @@ find %{buildroot} -name "*.bs" |xargs rm -f find %{buildroot} -name ".packlist" |xargs rm -f find %{buildroot} -name "perllocal.pod" |xargs rm -f -# Do NOT remove .la files for codecs -# https://bugzilla.novell.com/show_bug.cgi?id=579798 - # 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 find %{buildroot}%{perl_vendorarch} -type d -print \ @@ -233,9 +308,11 @@ if [ -z perl-pkg-files ] ; then echo "ERROR: EMPTY FILE LIST" exit -1 fi +%endif -# fix multilib issues: Rename provided file with platform-bits in name. -# Create platform independant file inplace of provided and conditionally include required. +# fix multilib issues: Rename the provided file with platform-bits in name. +# Create platform independent file inplace of the provided one and conditionally +# include the required one. # $1 - filename.h to process. function multilibFileVersions(){ mv $1 ${1%%.h}-%{__isa_bits}.h @@ -255,111 +332,217 @@ cat >$1 </dev/null 2>&1 +if [ $? -ne 0 ]; then + echo Error: No files containing %{subsover} found + exit 1 +fi %check +%if %{with tests} export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %make_build check +%endif rm PerlMagick/demo/Generic.ttf -%ldconfig_scriptlets libs -%ldconfig_scriptlets c++ %files -%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt +%doc NOTICE AUTHORS.txt +%license LICENSE %{_bindir}/[a-z]* %{_mandir}/man[145]/[a-z]* %{_mandir}/man1/%{name}.* %files libs -%doc LICENSE NOTICE AUTHORS.txt QuickStart.txt -%{_libdir}/libMagickCore-6.Q16.so.7* -%{_libdir}/libMagickWand-6.Q16.so.7* +%doc NOTICE AUTHORS.txt +%license LICENSE +%{_libdir}/libMagickCore-7.Q16HDRI.so.%{libsover}{,.*} +%{_libdir}/libMagickWand-7.Q16HDRI.so.%{libsover}{,.*} %{_libdir}/%{name}-%{VER} -%{_datadir}/%{name}-6 -%exclude %{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.* -%dir %{_sysconfdir}/%{name}-6 -%config(noreplace) %{_sysconfdir}/%{name}-6/*.xml +%{_datadir}/%{name}-7 +%exclude %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/djvu.* +%if %{with libheif} +%exclude %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/heic.* +%endif +%dir %{_sysconfdir}/%{name}-7 +%config(noreplace) %{_sysconfdir}/%{name}-7/*.xml %files devel %{_bindir}/MagickCore-config -%{_bindir}/Magick-config %{_bindir}/MagickWand-config -%{_bindir}/Wand-config -%{_libdir}/libMagickCore-6.Q16.so -%{_libdir}/libMagickWand-6.Q16.so +%{_libdir}/libMagickCore-7.Q16HDRI.so +%{_libdir}/libMagickWand-7.Q16HDRI.so %{_libdir}/pkgconfig/MagickCore.pc -%{_libdir}/pkgconfig/MagickCore-6.Q16.pc +%{_libdir}/pkgconfig/MagickCore-7.Q16HDRI.pc %{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-6.Q16.pc +%{_libdir}/pkgconfig/ImageMagick-7.Q16HDRI.pc %{_libdir}/pkgconfig/MagickWand.pc -%{_libdir}/pkgconfig/MagickWand-6.Q16.pc -%{_libdir}/pkgconfig/Wand.pc -%{_libdir}/pkgconfig/Wand-6.Q16.pc -%dir %{_includedir}/%{name}-6 -%{_includedir}/%{name}-6/magick -%{_includedir}/%{name}-6/wand -%{_mandir}/man1/Magick-config.* +%{_libdir}/pkgconfig/MagickWand-7.Q16HDRI.pc +%dir %{_includedir}/%{name}-7 +%{_includedir}/%{name}-7/MagickCore/ +%{_includedir}/%{name}-7/MagickWand/ +%{_includedir}/%{name}-7/magick +%{_includedir}/%{name}-7/wand %{_mandir}/man1/MagickCore-config.* -%{_mandir}/man1/Wand-config.* %{_mandir}/man1/MagickWand-config.* %files djvu -%{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.* +%{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/djvu.* + +%if %{with libheif} +%files heic +%{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/heic.* +%endif %files doc -%doc %{_datadir}/doc/%{name}-6 -%doc %{_datadir}/doc/%{name}-%{VER} -%doc LICENSE +%doc %{_datadir}/doc/%{name}-7 %files c++ -%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README -%doc www/Magick++/COPYING -%{_libdir}/libMagick++-6.Q16.so.9* +%doc Magick++/AUTHORS +%license Magick++/LICENSE +%{_libdir}/libMagick++-7.Q16HDRI.so.%{libcxxsover}{,.*} %files c++-devel -%doc Magick++/examples +%doc Magick++/demo %{_bindir}/Magick++-config -%{_includedir}/%{name}-6/Magick++ -%{_includedir}/%{name}-6/Magick++.h -%{_libdir}/libMagick++-6.Q16.so +%{_includedir}/%{name}-7/Magick++/ +%{_includedir}/%{name}-7/Magick++.h +%{_libdir}/libMagick++-7.Q16HDRI.so %{_libdir}/pkgconfig/Magick++.pc -%{_libdir}/pkgconfig/Magick++-6.Q16.pc -%{_libdir}/pkgconfig/ImageMagick++.pc -%{_libdir}/pkgconfig/ImageMagick++-6.Q16.pc +%{_libdir}/pkgconfig/Magick++-7.Q16HDRI.pc %{_mandir}/man1/Magick++-config.* +%if %{with perl} %files perl -f perl-pkg-files %{_mandir}/man3/* %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt +%endif %changelog -* Thu Oct 24 2024 Sérgio Basto - 1:6.9.13.17-1 -- Update ImageMagick to 6.9.13.17 (#2321505) +* Fri Feb 07 2025 Eduard Basov - 7.1.1.43-1 +- Rebuilt for MSVSphere 10 + +* Tue Jan 28 2025 Packit - 1:7.1.1.43-1 +- Update to version 7.1.1.43 + +* Tue Jan 28 2025 Packit - 1:7.1.1.43-1 +- Update to version 7.1.1.43 +- Resolves: rhbz#2334042 +- Fix files of ImageMagick-heic in 2 sub-packages (#2330605) + +* Thu Jan 16 2025 Fedora Release Engineering - 1:7.1.1.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Nov 17 2024 Packit - 1:7.1.1.41-1 +- Update to version 7.1.1.41 +- Resolves: rhbz#2326736 + +* Thu Nov 14 2024 Sérgio Basto - 1:7.1.1.40-2 +- Revert map changes breaking ABI + +* Sat Nov 09 2024 Packit - 1:7.1.1.40-1 +- Update to version 7.1.1.40 +- Resolves: rhbz#2324946 + +* Fri Oct 25 2024 Packit - 1:7.1.1.39-1 +- Update to version 7.1.1.39 +- Resolves: rhbz#2316866 + +* Fri Sep 06 2024 Sérgio Basto - 1:7.1.1.38-1 +- Update ImageMagick to 7.1.1.38 (#2293863) + +* Thu Aug 08 2024 Sérgio Basto - 1:7.1.1.33-3 +- Build with Epoch for ELN + +* Wed Jul 17 2024 Fedora Release Engineering - 1:7.1.1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 17 2024 Sérgio Basto - 1:7.1.1.33-1 +- Update ImageMagick to 7.1.1.33 (#2259429) +- Sync with Remi's RPM + +* Mon Jun 10 2024 Jitka Plesnikova - 1:7.1.1.26-9 +- Perl 5.40 rebuild -* Thu Aug 01 2024 Sérgio Basto - 1:6.9.13.14-1 -- Update ImageMagick to 6.9.13.14 +* Wed Apr 24 2024 Benjamin A. Beasley - 1:7.1.1.26-8 +- Rebuilt for openexr 3.2.4 -* Thu Oct 19 2023 Sérgio Basto - 1:6.9.12.93-2 -- Mass rebuild for libRaw +* Wed Mar 13 2024 Sérgio Basto - 1:7.1.1.26-7 +- Rebuild for jpegxl (libjxl) 0.10.2 -* Tue Aug 22 2023 Sérgio Basto - 1:6.9.12.93-1 -- Update ImageMagick to 6.9.12.93 +* Wed Feb 14 2024 Sérgio Basto - 1:7.1.1.26-6 +- Rebuild for jpegxl (libjxl) 0.9.2 with soname bump -* Sun May 07 2023 Sérgio Basto - 1:6.9.12.86-1 -- Update ImageMagick to 6.9.12.86 +* Mon Jan 22 2024 Fedora Release Engineering - 1:7.1.1.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Sat Mar 25 2023 Sérgio Basto - 1:6.9.12.82-1 -- Update ImageMagick to 6.9.12.82 (#2176863,2176861,2176860) +* Fri Jan 19 2024 Fedora Release Engineering - 1:7.1.1.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Mar 14 2023 Mamoru TASAKA - 1:6.9.12.77-2 +* Thu Jan 18 2024 Fedora Release Engineering - 1:7.1.1.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 15 2024 Sérgio Basto - 1:7.1.1.26-2 +- fix PKG_CONFIG_LIBDIR + +* Mon Jan 08 2024 Fedora Release Monitoring - 1:7.1.1.26-1 +- Update to 7.1.1.26 (#2239345) + +* Tue Aug 22 2023 Sérgio Basto - 1:7.1.1.15-1 +- Update ImageMagick to 7.1.1.15 (#2217558) + +* Wed Jul 19 2023 Fedora Release Engineering - 1:7.1.1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jul 16 2023 Fedora Release Monitoring - 1:7.1.1.13-1 +- Update to 7.1.1.13 (#2217558) + +* Tue Jul 11 2023 Jitka Plesnikova - 1:7.1.1.11-3 +- Perl 5.38 rebuild + +* Sun Jun 18 2023 Sérgio Basto - 1:7.1.1.11-2 +- Mass rebuild for jpegxl-0.8.1 + +* Mon May 29 2023 Fedora Release Monitoring - 1:7.1.1.11-1 +- Update to 7.1.1.11 (#2210875) + +* Mon May 22 2023 Fedora Release Monitoring - 1:7.1.1.10-1 +- Update to 7.1.1.10 (#2207788) + +* Sat Apr 22 2023 Fedora Release Monitoring - 1:7.1.1.8-1 +- Update to 7.1.1.8 (#2181846) + +* Mon Mar 27 2023 Luya Tshimbalanga - 1:7.1.1.4-3 +- Stop requiring ghostcripts-x11 upon request for security issue + +* Thu Mar 23 2023 Kalev Lember - 1:7.1.1.4-2 +- Fix missing epoch in ImageMagick-heic requires (#2181176) + +* Wed Mar 22 2023 Sérgio Basto - 1:7.1.1.4-1 +- Update ImageMagick to 7.1.1.4 (#2176749) +- Add support to libheif and add html docs + +* Mon Mar 13 2023 Mamoru TASAKA - 1:7.1.0-62-2 - Backport upstream fix for GetPageGeometry misbehavior (bug 2177631) -* Tue Feb 14 2023 Sérgio Basto - 1:6.9.12.77-1 -- Update ImageMagick to 6.9.12.77 +* Thu Feb 23 2023 Sérgio Basto - 1:7.1.0.62-1 +- Update ImageMagick to 7.1.0.62 + +* Sun Jan 29 2023 Luya Tshimbalanga - 1:7.1.0.57-4 +- Actually rebuilt for ghostcripts 10.0.0 + +* Tue Jan 24 2023 Luya Tshimbalanga - 1:7.1.0.57-3 +- Rebuilt for ghostcripts 10.0.0 + +* Wed Jan 18 2023 Fedora Release Engineering - 1:7.1.0.57-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 03 2023 Neal Gompa - 1:7.1.0.57-1 +- Rebase to ImageMagick v7 * Thu Dec 22 2022 Sérgio Basto - 1:6.9.12.70-1 - Update ImageMagick to 6.9.12.70 (#2150658) diff --git a/sources b/sources deleted file mode 100644 index 563074e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (ImageMagick-6.9.13-17.tar.xz) = 655d8faa4387fd840e2a082633f55d961b3f6bb3c4909debec8272e7abbf9da4afb9994628a493229b41cbc17baba765812cf3d02fc69dd0eb2f2511e85b31c0