summaryrefslogtreecommitdiffstats
path: root/ImageMagick7.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-30 15:43:23 +0100
committerRemi Collet <remi@remirepo.net>2017-11-30 15:43:23 +0100
commit1e4573bb8f728b09c4072c9be25d167d60dbf392 (patch)
tree056e0fd913b7bad178ac923dd0d5c653c2ac93b7 /ImageMagick7.spec
parent4f97fa563e846c9c940b05f2eff5c7047ef3a80e (diff)
add upstream patch for #888
Diffstat (limited to 'ImageMagick7.spec')
-rw-r--r--ImageMagick7.spec10
1 files changed, 9 insertions, 1 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 96e8265..014ca02 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -61,13 +61,16 @@ 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: https://github.com/ImageMagick/ImageMagick/commit/1db0ae830c0e71218fb3b1916941901802b8c813.patch
+Patch1: https://github.com/ImageMagick/ImageMagick/commit/8558aa4d14275251e0154e837977c16b7895e124.patch
+
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
@@ -309,6 +312,8 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
+%patch0 -p1 -b.upstream
+%patch1 -p1 -b.upstream
# for %%doc
mkdir Magick++/examples
@@ -542,6 +547,9 @@ fi
%changelog
+* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 7.0.7.12-2
+- add upstream patch for #888
+
* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 7.0.7.12-1
- update to version 7.0.7 patch level 12
- open https://github.com/ImageMagick/ImageMagick/issues/888