From a944785cacf14d450a15cbb37de40826954d26a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Dec 2020 14:40:16 +0100 Subject: cleanup --- ImageMagick6.spec | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/ImageMagick6.spec b/ImageMagick6.spec index e3c2899..04db954 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -14,42 +14,21 @@ %global libsuffixe -6.Q16 %bcond_without tests -%global with_djvu 1 -%global with_webp 1 -%global with_jp2 1 - -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 -%global with_jbig 1 -%else -%global with_jbig 0 -%endif - -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 +%global with_djvu 1 +%global with_webp 1 +%global with_jp2 1 +%global with_jbig 1 %global with_gslib 1 -%else -%global with_gslib 0 -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%global with_raw 1 -%else -%global with_raw 0 -%endif - -%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 -%global with_raqm 1 -%else -%global with_raqm 0 -%endif +%global with_raw 1 +%global with_raqm 1 +%global with_gvc 1 %if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_lqr 1 +%global with_lqr 1 %else -%global with_lqr 0 +%global with_lqr 0 %endif -%global with_gvc 1 - # from mock config, when rpmfusion enabled %global with_libheif 0%{?_with_rpmfusion:1} @@ -87,13 +66,8 @@ BuildRequires: bzip2-devel %endif BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libpng) -%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libjpeg) -%else -BuildRequires: libtiff-devel -BuildRequires: libjpeg-turbo-devel -%endif BuildRequires: giflib-devel BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libzstd) @@ -132,11 +106,7 @@ BuildRequires: jbigkit-devel # vips pulls poppler (libopenjpeg) and IM (libopenjp2) BuildRequires: openjpeg2-static-devel %else -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: pkgconfig(libopenjp2) -%else -BuildRequires: openjpeg2-devel >= 2.1.0 -%endif %endif %endif %if %{with_gvc} -- cgit