diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-02-06 11:32:06 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-02-06 11:32:06 +0100 |
| commit | 0d0e4af76305b972948142ccdac32bd36caf0d04 (patch) | |
| tree | 055bb334c77f291dc7d262abd99431e877a07e49 | |
| parent | 49453278bf446a81eaee777de7e4b584d79c26d6 (diff) | |
ImageMagick7: 7.0.4-7
| -rw-r--r-- | ImageMagick7-upstream.patch | 45 | ||||
| -rw-r--r-- | ImageMagick7.spec | 8 |
2 files changed, 4 insertions, 49 deletions
diff --git a/ImageMagick7-upstream.patch b/ImageMagick7-upstream.patch deleted file mode 100644 index 6ae016f..0000000 --- a/ImageMagick7-upstream.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9024139f4bf2f029a05ffaeaaf2158afef342785 Mon Sep 17 00:00:00 2001 -From: Cristy <urban-warrior@imagemagick.org> -Date: Sat, 28 Jan 2017 10:29:55 -0500 -Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/363 - ---- - Magick++/tests/color.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp -index 0ce2ebc..4d12324 100644 ---- a/Magick++/tests/color.cpp -+++ b/Magick++/tests/color.cpp -@@ -40,7 +40,7 @@ int main( int /*argc*/, char **argv) - struct colorStr colorMap [] = - { - { "red", 1,0,0 }, -- { "green", 0,0.5019607843137256,0 }, -+ { "green", 0,0.5019607843137255,0 }, - { "blue", 0,0,1 }, - { "black", 0,0,0 }, - { "white", 1,1,1 }, -From a5c463d59268d2557d90565415b8e5047b25e7d2 Mon Sep 17 00:00:00 2001 -From: Dirk Lemstra <dirk@git.imagemagick.org> -Date: Mon, 30 Jan 2017 13:28:58 +0100 -Subject: [PATCH] Use lime instead of green to avoid rounding issues (fixes - #363). - ---- - Magick++/tests/color.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp -index 4d12324..138ed21 100644 ---- a/Magick++/tests/color.cpp -+++ b/Magick++/tests/color.cpp -@@ -40,7 +40,7 @@ int main( int /*argc*/, char **argv) - struct colorStr colorMap [] = - { - { "red", 1,0,0 }, -- { "green", 0,0.5019607843137255,0 }, -+ { "lime", 0,1,0 }, - { "blue", 0,0,1 }, - { "black", 0,0,0 }, - { "white", 1,1,1 }, diff --git a/ImageMagick7.spec b/ImageMagick7.spec index bbdbc5b..fe24f27 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.0.4 -%global Patchlevel 6 +%global Patchlevel 7 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %global with_tests 0%{!?_without_tests:1} @@ -69,8 +69,6 @@ License: ImageMagick Url: http://www.imagemagick.org/ Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz -Patch0: %{name}-upstream.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, giflib-devel, zlib-devel @@ -282,7 +280,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch0 -p1 -b .upstream # for %%doc mkdir Magick++/examples @@ -497,6 +494,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 6 2017 Remi Collet <remi@remirepo.net> - 7.0.4.7-1 +- update to version 7.0.4 patchlevel 7 + * Mon Jan 30 2017 Remi Collet <remi@remirepo.net> - 7.0.4.6-1 - add upstream patch for tests on 32bits |