diff options
Diffstat (limited to 'ImageMagick6.spec')
| -rw-r--r-- | ImageMagick6.spec | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 3a28c6e..8fe3f52 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -12,7 +12,7 @@ %global Patchlevel 21 %global incsuffixe -6 %global libsuffixe -6.Q16 -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %global with_djvu 1 %global with_webp 1 @@ -71,7 +71,7 @@ Name: %{libname}6 %global move 1 %endif Version: %{VER}.%{Patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ @@ -79,6 +79,7 @@ Url: http://www.imagemagick.org/ Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz Patch0: https://github.com/ImageMagick/ImageMagick6/commit/147e71502f8f08f986c35bb1387dc0e7543dbcb7.patch +Patch1: https://patch-diff.githubusercontent.com/raw/ImageMagick/ImageMagick6/pull/86.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -382,6 +383,7 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} %patch0 -p1 +%patch1 -p1 # for %%doc mkdir Magick++/examples @@ -516,7 +518,7 @@ multilibFileVersions %{buildroot}%{_includedir}/%{libname}-6/magick/magick-basec multilibFileVersions %{buildroot}%{_includedir}/%{libname}-6/magick/version.h -%if %{with_tests} +%if %{with tests} %check export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make %{?_smp_mflags} check @@ -640,8 +642,8 @@ fi %changelog -* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-2 -- test build for upstream fix +* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-3 +- add fix from https://github.com/ImageMagick/ImageMagick6/pull/86 * Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 6.9.11.21-1 - update to version 6.9.11 patch level 21 still affected by |