diff options
| -rw-r--r-- | ImageMagick6.spec | 101 |
1 files changed, 22 insertions, 79 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 5bc9c13..96a53f5 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.13 -%global Patchlevel 10 +%global Patchlevel 16 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -25,12 +25,7 @@ %global with_raw 1 %global with_raqm 1 %global with_gvc 1 - -%if 0%{?fedora} || 0%{?rhel} >= 8 %global with_lqr 1 -%else -%global with_lqr 0 -%endif %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || 0%{?_with_rpmfusion:1} # from distribution or from rpmfusion, when enabled in mock config @@ -41,29 +36,16 @@ %global libname ImageMagick -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -# 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 - %if 0%{?fedora} >= 38 # No need to relocate as ImageMagick is v7 Name: %{libname}6 %global move 0 %else -%if 0%{?fedora} >= 34 || 0%{?rhel} >= 8 # No need to relocate as same soname Name: %{libname} %global move 0 -%else -# Need to relocate as different soname -Name: %{libname}6 -%global move 1 -%endif %endif +Epoch: 1 Version: %{VER}.%{Patchlevel} Release: 1%{?dist} Summary: An X application for displaying and manipulating images @@ -75,11 +57,7 @@ Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel} BuildRequires: gcc BuildRequires: gcc-c++ -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: pkgconfig(bzip2) -%else -BuildRequires: bzip2-devel -%endif BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) @@ -107,33 +85,19 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libraw) >= 0.14.8 %endif %if %{with_webp} -%if 0%{?rhel} == 7 -BuildRequires: libwebp7-devel -%else BuildRequires: pkgconfig(libwebp) %endif -%endif %if %{with_jbig} BuildRequires: jbigkit-devel %endif %if %{with_jp2} -%if 0%{?rhel} == 7 -# See https://github.com/libvips/libvips/issues/764 -# vips pulls poppler (libopenjpeg) and IM (libopenjp2) -BuildRequires: openjpeg2-static-devel -%else BuildRequires: pkgconfig(libopenjp2) %endif -%endif %if %{with_gvc} BuildRequires: graphviz-devel >= 2.9.0 %endif %if %{with_raqm} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: pkgconfig(raqm) -%else -BuildRequires: libraqm-devel -%endif %endif %if %{with_lqr} BuildRequires: liblqr-1-devel @@ -141,8 +105,6 @@ BuildRequires: liblqr-1-devel BuildRequires: libgomp Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last < %{epoch}:%{version} -Obsoletes: ImageMagick2-tools < %{epoch}:%{version} %if "%{name}" != "%{libname}" # This could be improved in the future @@ -167,7 +129,7 @@ reduce, or add special effects to an image, and when finished you can either save the completed work in the original format or a different one. -ImageMagick-last includes the command line programs for creating animated or +%{name} includes the command line programs for creating animated or transparent .gifs, creating composite images, creating thumbnail images, and more. %if "%{name}" != "%{libname}" @@ -188,27 +150,20 @@ Requires: libjpeg-devel%{?_isa} Requires: OpenEXR-devel%{?_isa} Requires: lcms2-devel%{?_isa} %if %{with_webp} -%if 0%{?rhel} == 7 -Requires: libwebp7-devel%{?_isa} -%else Requires: libwebp-devel%{?_isa} %endif -%endif %if %{with_jbig} Requires: jbigkit-devel%{?_isa} %endif %if %{with_jp2} -%if 0%{?rhel} != 7 Requires: openjpeg2-devel%{?_isa} %endif -%endif Requires: jasper-devel%{?_isa} Requires: pkgconfig %if "%{name}" != "%{libname}" Conflicts: %{libname}-devel < %{epoch}:%{version} Provides: %{libname}-devel = %{epoch}:%{version}-%{release} Provides: %{libname}-devel%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last-devel < %{epoch}:%{version} %else Obsoletes: %{libname}6-devel < %{epoch}:%{version}-%{release} Provides: %{libname}6-devel = %{epoch}:%{version}-%{release} @@ -216,7 +171,7 @@ Provides: %{libname}6-devel%{?_isa} = %{epoch}:%{version}-%{release} %endif %description devel -ImageMagick-last-devel contains the library links and header files you'll +%{name}-devel contains the library links and header files you'll need to develop ImageMagick applications. ImageMagick is an image manipulation program. @@ -228,22 +183,15 @@ however. %package libs Summary: ImageMagick library -Obsoletes: ImageMagick2 < %{epoch}:%{version} -Obsoletes: ImageMagick-last-libs < %{epoch}:%{version} %if "%{name}" == "%{libname}" Obsoletes: %{libname}6-libs <= %{epoch}:%{version}-%{release} %endif # default font is OpenSans-Regular -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Recommends: urw-base35-fonts Recommends: open-sans-fonts # Additional codecs Recommends: %{name}-djvu%{?_isa} = %{epoch}:%{version}-%{release} Recommends: %{name}-heic%{?_isa} = %{epoch}:%{version}-%{release} -%else -Requires: urw-base35-fonts -Requires: open-sans-fonts -%endif %description libs Provides the shared libraries and plugins of %{name}. @@ -256,13 +204,8 @@ for applications requiring this libraries. %if %{with_djvu} %package djvu Summary: DjVu plugin for ImageMagick -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: pkgconfig(ddjvuapi) -%else -BuildRequires: djvulibre-devel -%endif Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last-djvu < %{epoch}:%{version} %if "%{name}" == "%{libname}" Obsoletes: %{libname}6-djvu <= %{epoch}:%{version}-%{release} %endif @@ -280,13 +223,7 @@ for applications requiring this libraries. %if %{with_libheif} %package heic Summary: HEIC plugin for ImageMagick -%if 0%{?rhel} == 7 -# ensure we use our on EL-7 -BuildRequires: pkgconfig(libheif) >= 1.4.0 -Requires: libheif%{?_isa} >= 1.4.0 -%else BuildRequires: pkgconfig(libheif) -%endif %if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 # x265 HEVC encoder from RPMFusion Recommends: libheif-freeworld%{?_isa} @@ -309,7 +246,6 @@ for applications requiring this libraries. %package doc Summary: ImageMagick html documentation BuildRequires: doxygen -Obsoletes: ImageMagick-last-doc < %{epoch}:%{version} %if "%{name}" == "%{libname}" Obsoletes: %{libname}6-doc <= %{epoch}:%{version}-%{release} %endif @@ -332,7 +268,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Conflicts: %{libname}-perl < %{epoch}:%{version} Provides: %{libname}-perl = %{epoch}:%{version}-%{release} Provides: %{libname}-perl%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last-perl < %{epoch}:%{version} %else Obsoletes: %{libname}6-perl <= %{epoch}:%{version}-%{release} %endif @@ -347,7 +282,6 @@ ImageMagick. %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last-c++ < %{epoch}:%{version} %if "%{name}" == "%{libname}" Obsoletes: %{libname}6-c++ <= %{epoch}:%{version}-%{release} %endif @@ -371,7 +305,6 @@ Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} Conflicts: %{libname}-c++-devel < %{epoch}:%{version} Provides: %{libname}-c++-devel = %{epoch}:%{version}-%{release} Provides: %{libname}-c++-devel%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-last-c++-devel < %{epoch}:%{version} %else Obsoletes: %{libname}6-c++-devel <= %{epoch}:%{version}-%{release} %endif @@ -552,14 +485,6 @@ the new location (e.g. httpd, php-fpm). EOF fi -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post libs -p /sbin/ldconfig -%post c++ -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig -%postun c++ -p /sbin/ldconfig -%endif - %files %{_bindir}/[a-z]* @@ -652,6 +577,24 @@ fi %changelog +* Mon Sep 2 2024 Remi Collet <remi@remirepo.net> - 6.9.13.16-1 +- update to version 6.9.13 patch level 16 + +* Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 6.9.13.15-1 +- update to version 6.9.13 patch level 15 + +* Mon Jul 29 2024 Remi Collet <remi@remirepo.net> - 6.9.13.14-1 +- update to version 6.9.13 patch level 14 + +* Mon Jul 15 2024 Remi Collet <remi@remirepo.net> - 6.9.13.13-1 +- update to version 6.9.13 patch level 13 + +* Tue Jul 2 2024 Remi Collet <remi@remirepo.net> - 6.9.13.12-1 +- update to version 6.9.13 patch level 12 + +* Mon May 27 2024 Remi Collet <remi@remirepo.net> - 6.9.13.11-1 +- update to version 6.9.13 patch level 11 + * Mon May 13 2024 Remi Collet <remi@remirepo.net> - 6.9.13.10-1 - update to version 6.9.13 patch level 10 |