From 7d969289d086e2df34c41d6bb80b74d92184f064d0bcc1a0a938e271c3ef5da0 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 3 Jun 2019 09:19:38 +0000
Subject: [PATCH] - version update to 7.0.8.48   * Fix transient convolution
 bug. - deleted patches   - ImageMagick-montage.t-failing.patch (upstreamed)

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=442
---
 ImageMagick-7.0.8-47.tar.bz2        |  3 ---
 ImageMagick-7.0.8-47.tar.bz2.asc    | 17 -----------------
 ImageMagick-7.0.8-48.tar.bz2        |  3 +++
 ImageMagick-7.0.8-48.tar.bz2.asc    | 17 +++++++++++++++++
 ImageMagick-montage.t-failing.patch | 22 ----------------------
 ImageMagick.changes                 |  8 ++++++++
 ImageMagick.spec                    |  5 +----
 7 files changed, 29 insertions(+), 46 deletions(-)
 delete mode 100644 ImageMagick-7.0.8-47.tar.bz2
 delete mode 100644 ImageMagick-7.0.8-47.tar.bz2.asc
 create mode 100644 ImageMagick-7.0.8-48.tar.bz2
 create mode 100644 ImageMagick-7.0.8-48.tar.bz2.asc
 delete mode 100644 ImageMagick-montage.t-failing.patch

diff --git a/ImageMagick-7.0.8-47.tar.bz2 b/ImageMagick-7.0.8-47.tar.bz2
deleted file mode 100644
index dd87433..0000000
--- a/ImageMagick-7.0.8-47.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c665276e69e2227d257cdb352d69ed0fd160b5592ec854a9c4b335a71de3384
-size 11510841
diff --git a/ImageMagick-7.0.8-47.tar.bz2.asc b/ImageMagick-7.0.8-47.tar.bz2.asc
deleted file mode 100644
index 57da405..0000000
--- a/ImageMagick-7.0.8-47.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJc7BFGAAoJEImrY9SCdzd6FvAP/1rP6yqsCNDqjfkOhnQhQZIk
-pYxo6NW84X3wKOxZoaQxjGsjvi/7KotCM9B2uopnf7vHCsSNic60r3qTz3MKHd6Q
-Qc+nwsc3vlPQJlhykW7rSCq8Jw7ZyCzWtdc2GRumH2DsmpaKCfIDwLPN7+d+4wIM
-rDjGY0HZNE5Cnlh4SzzhJA0FhrakW5/ifrLGY/+0chr1pIXv9mEGoQhhba8Qr0Cd
-Ay/hnQNLfzI66hpCuPYvY46EnHa3q5SY9qPVaNWthXA0uEGyAErjR62v+fXW1dhr
-+EvM4LyzESD4WvyWD25K+yQWKcIfUxfaEgaaSTvOlgBYOfm19z4+0Jh8Az5LzbWs
-baV1k7BD5xeP23TanMfsVALV9QSsNLFuGJSxLyLPnY2EFVtD8xN22eS9rcwLPDqC
-ivuvlcWTQ1iwp3UX5OPpvEZjAE3RjpP3k3eKsc3CqDQizcEQ2qdvNQOjRE1ZFQrc
-87ZreEb5ZodDkM0S6Lp9rM85Ay+Fp9gUqKM7SETnrpNg/OMBSP4xgkuRnmppU3L7
-w4+80ONoTG+imQNtFsTC6GQSNGidJqtmc5QQTyEA8a38kkRj5lHxv6jVN8Ul2q3T
-2dJ2HXYsTOXvvabmBI06nTOZObp1tRA1YWNsNP1VWx+jWrE3iYIG5f6XyczQCemM
-JkrZxLhRJmv/kDFz9io7
-=vGRE
------END PGP SIGNATURE-----
diff --git a/ImageMagick-7.0.8-48.tar.bz2 b/ImageMagick-7.0.8-48.tar.bz2
new file mode 100644
index 0000000..5b79e20
--- /dev/null
+++ b/ImageMagick-7.0.8-48.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8c470a204778fba56e9c7a95e8f220a1208f0d96535872dc7820a9993989b35
+size 11511175
diff --git a/ImageMagick-7.0.8-48.tar.bz2.asc b/ImageMagick-7.0.8-48.tar.bz2.asc
new file mode 100644
index 0000000..00d5e24
--- /dev/null
+++ b/ImageMagick-7.0.8-48.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJc8uSHAAoJEImrY9SCdzd6XTUQAI4d0dyB1DiWItffl3RvLa4x
+OGnURNKpfJ2gYLE0aQepTq1UhtOj6hdKbBTk6wtDXv+CNmX0MN/xU+EwTp811gcr
+bwNWVz8jn50eh/hymLI3HirQbT5Kk4d8AnEoxvbD6eeaDe+T/5sZRc8IcFsLIe9f
+kCQitonBd24mjjzalCEL94lKeGYYuhs5jUMkhFMWxwuh5CWSccRsbDcUCvOedW/I
+titwTrS1R5zLfwwfXm1N0oX+BU4wN85Kuiaa0Ay2cdiHTlS2Nd9dyjhSIevsdCyg
+EEVXjxSk5rUoNsa/LE1bsg8Z1Be1xgf6B82voWn/c5lfkZLvIrzTHzwmp6dyCsq8
+zIh4i8oRUt3ri3u//9QGPqwVPXo0TqUguAcPTcDKks9Jsop9IxN9OMsWQCU4JTM9
+/g7IDDSIux419CvQb6q2Eql7ST18A9cDjhMjyoaAPh8UEPaw0jlUBKzk8vrj4suA
+v+CM26NyroUSl+9dHEnWp9JtJcJwnaUvv+gysqkvvsEVFvDNOPMbZc5drkK0jCxR
+n+hxvWaM3WZtix838oMdJRdhy7nqOnMXV5vTYE69RLLoIpO+8EA+KBrN8BLSNf9o
+79wWUmW4V9st0WZcXioagmdQVXzKRXhcxuAKx3nYxBqQ4Fh/kqSzUQ4gJppeQI9y
+KZy5TwYybShzEyLSZ57k
+=6BUv
+-----END PGP SIGNATURE-----
diff --git a/ImageMagick-montage.t-failing.patch b/ImageMagick-montage.t-failing.patch
deleted file mode 100644
index 646a4ac..0000000
--- a/ImageMagick-montage.t-failing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: ImageMagick-7.0.8-47/PerlMagick/t/montage.t
-===================================================================
---- ImageMagick-7.0.8-47.orig/PerlMagick/t/montage.t	2019-05-27 01:14:49.000000000 +0200
-+++ ImageMagick-7.0.8-47/PerlMagick/t/montage.t	2019-05-28 10:27:31.193023910 +0200
-@@ -131,7 +131,7 @@ testMontage( q/bordercolor=>'blue', matt
- testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
-   q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
-   borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
--  'ff43a8c5dd980438c10436a71b47afc538ae3839ba57251768fa07add1229d8a');
-+  'ac3684de4138476dfb1f218f66f9d55df7bb40da8104a5248f765b7e448bcc51');
- 
- #
- # 13) Test Framed Montage with drop-shadows and background texture
-@@ -140,7 +140,7 @@ testMontage( q/bordercolor=>'blue', matt
- testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
-   q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
-   borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
--  '0de019cb1e17fb9d3e60e6ae3931c6d384859613c3fc930cfef46720cae8237');
-+  'c570ea56a9635799ff29d3410455c7a15a9c3acca23b9d97a79f257eeb0bf92e');
- 
- #
- # 14) Test Un-bordered, Un-framed Montage
diff --git a/ImageMagick.changes b/ImageMagick.changes
index ef3d8fb..df739df 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun  3 09:18:42 UTC 2019 - pgajdos@suse.com
+
+- version update to 7.0.8.48
+  * Fix transient convolution bug.
+- deleted patches
+  - ImageMagick-montage.t-failing.patch (upstreamed)
+
 -------------------------------------------------------------------
 Tue May 28 08:36:54 UTC 2019 - pgajdos@suse.com
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index f379329..0e92d44 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -20,7 +20,7 @@
 %define asan_build     0
 %define maj            7
 %define mfr_version    %{maj}.0.8
-%define mfr_revision   47
+%define mfr_revision   48
 %define quantum_depth  16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver        6
@@ -48,8 +48,6 @@ Patch0:         ImageMagick-configuration-SUSE.patch
 Patch2:         ImageMagick-library-installable-in-parallel.patch
 #%%ifarch s390x s390 ppc64 ppc
 Patch3:         ImageMagick-s390-disable-tests.patch
-# https://github.com/ImageMagick/ImageMagick/issues/1580
-Patch4:         ImageMagick-montage.t-failing.patch
 #%%endif
 BuildRequires:  chrpath
 BuildRequires:  fdupes
@@ -335,7 +333,6 @@ preserved.
 %ifarch s390x s390 ppc ppc64
 %patch3 -p1
 %endif
-%patch4 -p1
 
 %build
 # bsc#1088463