From b9759f4a6806fb4ae045b7dfd6c86dc66dca2312 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Aug 2024 11:40:29 +0200 Subject: spec cleanup --- ImageMagick7.spec | 50 +------------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 6f6ec15..3cb183c 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -25,6 +25,7 @@ %global with_raw 1 %global with_raqm 1 %global with_gvc 1 +%global with_lqr 1 %if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 %global with_jxl 1 @@ -32,12 +33,6 @@ %global with_jxl 0 %endif -%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 %global with_libheif 1 @@ -72,11 +67,7 @@ BuildRequires: gnupg2 BuildRequires: autoconf automake make 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) @@ -104,33 +95,19 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libraw) >= 0.14.8 %endif %if %{with_webp} -%if 0%{?rhel} == 7 -BuildRequires: libwebp7-devel%{?_isa} -%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_jxl} BuildRequires: pkgconfig(libjxl) >= 0.7 @@ -195,12 +172,8 @@ 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 @@ -240,16 +213,11 @@ Summary: ImageMagick library Obsoletes: %{libname}7-libs <= %{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}. @@ -262,11 +230,7 @@ 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} %if "%{name}" == "%{libname}" Obsoletes: %{libname}7-djvu <= %{epoch}:%{version}-%{release} @@ -286,10 +250,6 @@ for applications requiring this libraries. %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 %if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 # x265 HEVC encoder from RPMFusion Recommends: libheif-freeworld%{?_isa} @@ -564,14 +524,6 @@ the new location (e.g. httpd, php-fpm). EOF fi -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%post -p /sbin/ldconfig -%post c++ -p /sbin/ldconfig - -%postun -p /sbin/ldconfig -%postun c++ -p /sbin/ldconfig -%endif - %files %{_bindir}/[a-z]* -- cgit