diff options
| author | Remi Collet <remi@remirepo.net> | 2017-05-28 18:12:07 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-05-28 18:12:07 +0200 |
| commit | 76b3aa021ed265cbaec8a48fcde202157b3f7b55 (patch) | |
| tree | caa50e303b1249f06abb61434e2dbe9fbce8d392 /ImageMagick7.spec | |
| parent | 17655cf984af8b1df4bdeb2c4172316a9afa6c17 (diff) | |
add upstream patch for #501 + --with-openjp2
Diffstat (limited to 'ImageMagick7.spec')
| -rw-r--r-- | ImageMagick7.spec | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 0831bc2..aa96d9b 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -16,6 +16,7 @@ %global with_djvu 1 %global with_webp 1 +%global with_jp2 1 %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 %global with_jbig 1 @@ -23,12 +24,6 @@ %global with_jbig 0 %endif -%if 0%{?fedora} >= 21 -%global with_jp2 1 -%else -%global with_jp2 0 -%endif - %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %global with_gslib 1 %else @@ -65,13 +60,15 @@ Name: %{libname} Name: %{libname}7 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick Url: http://www.imagemagick.org/ Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: f13c6b54a879aaa771ec64b5a066b939e8f8e7f0.patch + BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, giflib-devel, zlib-devel %if 0%{?fedora} >= 7 || 0%{?rhel} >= 6 @@ -288,6 +285,7 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%patch0 -p1 -b .upstream # for %%doc mkdir Magick++/examples @@ -503,6 +501,10 @@ make %{?_smp_mflags} check %changelog +* Sun May 28 2017 Remi Collet <remi@remirepo.net> - 7.0.5.8-2 +- add upstream patch for #501 +- use --with-openjp2 option on Enterprise Linux + * Sun May 28 2017 Remi Collet <remi@remirepo.net> - 7.0.5.8-1 - update to version 7.0.5 patch level 8 - open https://github.com/ImageMagick/ImageMagick/issues/501 |