Accepting request 441321 from graphics

- Updated to 6.9.6-5
  * Web pages were broken when we moved to HTTPS protocol.
  * Restore -sharpen / -convolve options to work with CMYK (reference
    https://github.com/ImageMagick/ImageMagick/issues/299).
  * Off by one memory allocation (reference
    https://github.com/ImageMagick/ImageMagick/issues/296).
  * Prevent fault in MSL interpreter (reference
    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30797).
  * Added layer ZIP compression to the PSD encoder.
  * Unit test pass again after small SUN image patch.
  * Fixed incorrect RLE decoding when reading a DCM image that contains
    multiple segments.
  * Fixed incorrect RLE decoding when reading an SGI image (reference 
    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514)

OBS-URL: https://build.opensuse.org/request/show/441321
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=132

ImageMagick-6.8.8-1-disable-insecure-coders.patch

@@ -1,5 +1,7 @@
---- config/policy.xml.orig	2016-07-29 11:23:54.608603779 +0200
+Index: ImageMagick-6.9.6-5/config/policy.xml
-+++ config/policy.xml	2016-07-29 11:27:20.327153334 +0200
+===================================================================
+--- ImageMagick-6.9.6-5.orig/config/policy.xml	2016-11-15 12:05:54.000000000 +0100
++++ ImageMagick-6.9.6-5/config/policy.xml	2016-11-22 10:30:23.722541610 +0100
 @@ -65,4 +65,15 @@
    <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
    <!-- <policy domain="path" rights="none" pattern="@*"/>  -->

ImageMagick-6.9.5-10.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2805ab7945ca92251172335da992df800bcc09fee993eeb4711b20c53efeb233
-size 8794440

ImageMagick-6.9.5-10.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJX4daxAAoJEImrY9SCdzd6CCkP/j486NRmenkiUW+IWE6Sdb0k
-0DIShONKa2vr9Zn52ztyV4kCsrN1/Ud/0lw2GyQOA9AtCU2pDHDU2wd1OmoggAv6
-u70EwxhGmlLP+/jeJZOus8guOskZo2uG4Twh5l/emzQVQpxjbUaMhJSmfK6wFzWM
-sA4bqpo6HsmjgjM4fai8eO078RZIWxE1FRpvcDJCXQR9wwgrUl+xWoL2WfYQQ/Oa
-1+1DoTTXxdxBgJHVtvSGtkQP+NyjIMpIgw1JZBugEpvxWb9wVxXV+4WQH+Si/f12
-t6TFPnhXq5tYVe+tF7hYYN76moyHaoFS/xdy7f8I2aY4w1G7wIuumTZgSfZ8ENK0
-dPOcZVKwzLNB9XaYvuUsSygYDs4hnwldExF1nfjyvI9/pGfYCL7EtOXTwL7TCHne
-pup3WrHB7ZDoQWBFdTfTQqmVjq8yI3+qcX9prcMr6kGrf/oNP6ou6uXmDJok4+3C
-guNOx+r8v4AL8EpYeIxNkl1pAD7c1secYp0KtLsfYDF4xvuqs9MR54lBE6U79fft
-sE653zSTrNmFb/4jH5YVR/Wqvds+tYO5Br29czvR8d9zh4hlXG/MuQjeVR11Ln+h
-bHnl3/ykjWM+ZoopVX3XtDjyF9nMec8adwutMmwCYzh5ro6tINIyQ6ll51oAaek0
-SlUjl05DAHv2d+KQtnxp
-=PCwq
------END PGP SIGNATURE-----

ImageMagick-6.9.6-5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d0122ba93a3f16d09cadcd4228f996c0048f0a44d92113d3d61150faa78f40c
+size 8762376

ImageMagick-6.9.6-5.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJYKv45AAoJEImrY9SCdzd65mEQAKm3h6a4hZh1QmTQUwH6EXsB
+ek3MKBPVRkc0xFlCqox5k+4PjfzskOA94zEMVk0K2zyiq85HX/fewa3nWNgqGEo3
+ujc/kNGM++jRGIsgUIySYYZFmRnxriJileY6lCv4+3sa/IfXfJP5KHNiQ73cRqtz
+BlPZQFWN6TQ9/H6rGeL9cglrQxKaJvwCiWHtUhWToKmA6k1nWTTTfkdlE06Dff7i
+vI6KSC2fgLn3V6KcF21EFf8df6mk2PRxgc0MUktBa4s3K5UJ+eUSWfPo8SExqs89
+0I+Z8++RP2pm/WMfS8dbPBk5mZdMO2c30mqrz1jkRJTjZ2tny8MHxUBn90sger9A
+kGnhq57xOeQsBT/omhvQVvRjcGzVWZ8JlSA4X35qZ1DRPan6q8vNFnKlZN509JMd
+YmAh8TPpfMnj2jDJo2Gnb9qTCiddOigVdgz4vbbGxQumE7vJW98f+eRVOWehbw9W
+/7gQ/fgvmyXJLkvDY19ZcXlTClEZ7bQVYdTqamJLCvwpiApfFFf9O50LWGNkwBsN
+1TjodGDVtFyH0OAc7LqezlagPwSRW6lqucctAo9UP8Z+qRdTsiIqDwYoMHrvQlEG
+w+ReMI1eGe8vWCa4PXkhW0yvgq4cS8Z040ac9ZCBNsEqGf5B+XJNjzK866lgXW5D
+9lHjQ5ceICnBKmaHfl+R
+=odjZ
+-----END PGP SIGNATURE-----

ImageMagick.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Nov 22 09:32:21 UTC 2016 - pgajdos@suse.com
+
+- Updated to 6.9.6-5
+  * Web pages were broken when we moved to HTTPS protocol.
+  * Restore -sharpen / -convolve options to work with CMYK (reference
+    https://github.com/ImageMagick/ImageMagick/issues/299).
+  * Off by one memory allocation (reference
+    https://github.com/ImageMagick/ImageMagick/issues/296).
+  * Prevent fault in MSL interpreter (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30797).
+  * Added layer ZIP compression to the PSD encoder.
+  * Unit test pass again after small SUN image patch.
+  * Fixed incorrect RLE decoding when reading a DCM image that contains
+    multiple segments.
+  * Fixed incorrect RLE decoding when reading an SGI image (reference 
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514)
+
 -------------------------------------------------------------------
 Mon Sep 26 08:45:50 UTC 2016 - pgajdos@suse.com
 

ImageMagick.spec

@@ -62,8 +62,8 @@ BuildRequires:  xz
 BuildRequires:  zip
 
 %define maj           6
-%define mfr_version   %{maj}.9.5
+%define mfr_version   %{maj}.9.6
-%define mfr_revision  10
+%define mfr_revision  5
 %define quantum_depth 16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver   2
@@ -116,8 +116,8 @@ Requires:       libbz2-devel
 Requires:       ImageMagick = %{version}
 Requires:       libMagickCore%{libspec}-%{clibver} = %{version}
 Summary:        Viewer and Converter for Images - extra codecs
-Group:          Productivity/Graphics/Other
 #delegates configured in delegates.xml that imagemagick can use
+Group:          Productivity/Graphics/Other
 Recommends:     autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
 
 %package -n libMagickCore%{libspec}-%{clibver}
@@ -252,7 +252,7 @@ HTML documentation for ImageMagick library and scene examples.
 %patch3
 %patch4
 %patch11
-%patch20
+%patch20 -p1
 
 # remove executeable bits from per demos
 chmod -x PerlMagick/demo/*.pl