diff options
Diffstat (limited to 'ImageMagick7.spec')
| -rw-r--r-- | ImageMagick7.spec | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec index e6939e4..51a80e1 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -13,14 +13,10 @@ %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %ifarch x86_64 -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %else -%if 0%{?fedora} < 29 && 0%{?rhel} < 7 # https://github.com/ImageMagick/ImageMagick/issues/1570 -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif +%bcond_with tests %endif %global with_djvu 1 @@ -73,7 +69,7 @@ Name: %{libname} Name: %{libname}7 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 3%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ @@ -81,6 +77,8 @@ Url: http://www.imagemagick.org/ #Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: https://patch-diff.githubusercontent.com/raw/ImageMagick/ImageMagick/pull/2195.patch + BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -379,6 +377,7 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%patch0 -p1 # for %%doc mkdir Magick++/examples @@ -513,7 +512,7 @@ multilibFileVersions %{buildroot}%{_includedir}/%{libname}%{incsuffixe}/MagickCo multilibFileVersions %{buildroot}%{_includedir}/%{libname}%{incsuffixe}/MagickCore/version.h -%if %{with_tests} +%if %{with tests} %check export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make %{?_smp_mflags} check @@ -629,6 +628,10 @@ fi %changelog +* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 7.0.10.21-3 +- add fix from https://github.com/ImageMagick/ImageMagick6/pull/86 + https://github.com/ImageMagick/ImageMagick/pull/2195 + * Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 7.0.10.21-1 - update to version 7.0.10 patch level 21 |