summaryrefslogtreecommitdiffstats
path: root/ImageMagick6.spec
diff options
context:
space:
mode:
Diffstat (limited to 'ImageMagick6.spec')
-rw-r--r--ImageMagick6.spec16
1 files changed, 9 insertions, 7 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index d9de3ca..2563d31 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.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
@@ -62,13 +57,15 @@ Name: %{libname}
Name: %{libname}6
%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: b0c5222ce31e8f941fa02ff9c7a040fb2db30dbc.patch
+
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
@@ -289,6 +286,7 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
+%patch0 -p1 -b .upstream
# for %%doc
mkdir Magick++/examples
@@ -526,6 +524,10 @@ fi
%changelog
+* Sun May 28 2017 Remi Collet <remi@remirepo.net> - 6.9.8.7-2
+- add upstream patch for #501
+- use --with-openjp2 option on Enterprise Linux
+
* Sun May 28 2017 Remi Collet <remi@remirepo.net> - 6.9.8.7-1
- update to version 6.9.8 patch level 7
- open https://github.com/ImageMagick/ImageMagick/issues/501