From dd8d96e1627d9f34a63b343a320aae48c5af4abf Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 14 Jul 2025 01:51:12 +0800 Subject: [PATCH] 7.1.2-0 --- ....1-46.tar.xz => ImageMagick-7.1.2-0.tar.xz | 4 ++-- ImageMagick.spec | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) rename ImageMagick-7.1.1-46.tar.xz => ImageMagick-7.1.2-0.tar.xz (32%) diff --git a/ImageMagick-7.1.1-46.tar.xz b/ImageMagick-7.1.2-0.tar.xz similarity index 32% rename from ImageMagick-7.1.1-46.tar.xz rename to ImageMagick-7.1.2-0.tar.xz index 5867f0f..b9203a6 100644 --- a/ImageMagick-7.1.1-46.tar.xz +++ b/ImageMagick-7.1.2-0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:026d2c73fbfd92923b7da880973812913957babd437e9063dcdf7fdba9054f8a -size 10774848 +oid sha256:edc13694c2f27554b36dc4817d80284f52c07c31e1ef8b88c8a4902a723dd643 +size 10779688 diff --git a/ImageMagick.spec b/ImageMagick.spec index e2a2aad..be981c8 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -3,7 +3,7 @@ Name: ImageMagick Epoch: 1 -Version: 7.1.1.46 +Version: 7.1.2.0 Release: 1 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT @@ -14,7 +14,7 @@ Source0: https://imagemagick.org/archive/releases/%{name}-%{VER}-%{Patchl BuildRequires: bzip2-devel freetype-devel libjpeg-devel libpng-devel perl-generators BuildRequires: libtiff-devel giflib-devel zlib-devel perl-devel >= 5.8.1 jbigkit-devel -BuildRequires: libgs-devel ghostscript-x11 libwmf-devel +BuildRequires: libgs-devel ghostscript-x11 libwmf-devel pkgconfig(libheif) >= 1.4.0 BuildRequires: libtool-ltdl-devel libX11-devel libXext-devel libXt-devel lcms2-devel BuildRequires: libxml2-devel librsvg2-devel fftw-devel Imath-devel OpenEXR-devel BuildRequires: openjpeg2-devel >= 2.1.0 libwebp-devel autoconf automake gcc gcc-c++ open-sans-fonts @@ -36,9 +36,6 @@ or draw text, lines, polygons, ellipses and Bézier curves. %package devel Summary: Development files for ImageMagick Requires: ImageMagick = %{epoch}:%{version}-%{release} -Requires: libgs-devel libX11-devel libXext-devel libXt-devel -Requires: bzip2-devel freetype-devel libtiff-devel libjpeg-devel lcms2-devel -Requires: libwebp-devel OpenEXR-devel pkgconfig %description devel Development files for ImageMagick. @@ -90,14 +87,14 @@ 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 --without-dps --without-gcc-arch \ - --with-jbig --with-openjp2 \ + --with-jbig --with-openjp2 --with-heic \ --with-perl \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" %make_build %install %make_install -cp -a www/source %{buildroot}%{_datadir}/doc/ImageMagick-7.1.1 +cp -a www/source %{buildroot}%{_datadir}/doc/ImageMagick-%{VER} rm %{buildroot}%{_libdir}/*.la # fix weird perl module permissions @@ -134,7 +131,7 @@ rm PerlMagick/demo/Generic.ttf %{_bindir}/[a-z]* %{_libdir}/libMagickCore-7.Q16HDRI.so.10* %{_libdir}/libMagickWand-7.Q16HDRI.so.10* -%{_libdir}/ImageMagick-7.1.1 +%{_libdir}/ImageMagick-%{VER} %{_datadir}/ImageMagick-7 %dir %{_sysconfdir}/ImageMagick-7 %config(noreplace) %{_sysconfdir}/ImageMagick-7/*.xml @@ -154,7 +151,7 @@ rm PerlMagick/demo/Generic.ttf %files help %doc README.md %doc %{_datadir}/doc/ImageMagick-7 -%doc %{_datadir}/doc/ImageMagick-7.1.1 +%doc %{_datadir}/doc/ImageMagick-%{VER} %{_mandir}/man?/* %files perl -f perl-pkg-files @@ -174,6 +171,10 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog +* Mon Jul 14 2025 Funda Wang - 1:7.1.2.0-1 +- update to 7.1.2-0 +- drop redundant codec development packages requirements from devel package + * Wed Mar 19 2025 Funda Wang - 1:7.1.1.46-1 - update to 7.1.1-46 -- Gitee