summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-12-10 14:40:01 +0100
committerRemi Collet <remi@remirepo.net>2020-12-10 14:40:01 +0100
commita9b187074c5ddafed08565bdeb242e15ed0db758 (patch)
treee1e0ee64f7a58549f8bd5140b8f192b199b83b06
parent09a094f5ef9ca8e300410677ef6549176f45a82a (diff)
cleanup
-rw-r--r--ImageMagick7.spec53
1 files changed, 9 insertions, 44 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 7259650..ce36b03 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -12,49 +12,23 @@
%global Patchlevel 47
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
-%ifarch x86_64
%bcond_without tests
-%else
-# https://github.com/ImageMagick/ImageMagick/issues/1570
-%bcond_with tests
-%endif
-
-%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}
@@ -86,13 +60,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)
@@ -130,11 +99,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}