From 453caae954efaa2218a234f696171adf9888d27192fe2f008a99eec88fe0bad8 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 31 Oct 2011 13:54:01 +0000
Subject: [PATCH] - update to 6.7.3.2:   * removed upstreamed scene.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=106
---
 ImageMagick-6.7.2-7.tar.bz2     |  3 ---
 ImageMagick-6.7.2.7-scene.patch | 27 ---------------------------
 ImageMagick-6.7.3-2.tar.bz2     |  3 +++
 ImageMagick.changes             |  6 ++++++
 ImageMagick.spec                | 10 ++++++----
 5 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 ImageMagick-6.7.2-7.tar.bz2
 delete mode 100644 ImageMagick-6.7.2.7-scene.patch
 create mode 100644 ImageMagick-6.7.3-2.tar.bz2

diff --git a/ImageMagick-6.7.2-7.tar.bz2 b/ImageMagick-6.7.2-7.tar.bz2
deleted file mode 100644
index c0e494d..0000000
--- a/ImageMagick-6.7.2-7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b16f2b3984bd1098fc1586d26f41201c40cbd89db4617df9e76e3ce612d2b336
-size 10222109
diff --git a/ImageMagick-6.7.2.7-scene.patch b/ImageMagick-6.7.2.7-scene.patch
deleted file mode 100644
index 41d4d3e..0000000
--- a/ImageMagick-6.7.2.7-scene.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://trac.imagemagick.org/changeset/5359
-Index: magick/display.c
-===================================================================
---- magick/display.c
-+++ magick/display.c
-@@ -14578,7 +14578,7 @@
-         Window name is the base of the filename.
-       */
-       GetPathComponent(display_image->magick_filename,TailPath,filename);
--      if (GetImageListLength(display_image) == 1)
-+      if (display_image->scene == 0)
-         (void) FormatLocaleString(windows->image.name,MaxTextExtent,
-           "%s: %s",MagickPackageName,filename);
-       else
-Index: wand/display.c
-===================================================================
---- wand/display.c
-+++ wand/display.c
-@@ -667,6 +667,7 @@
-           state|=ExitState;
-         if (LocaleCompare(filename,"-") == 0)
-           state|=ExitState;
-+        RemoveAllImageStack();
-         continue;
-       }
-     pend=image != (Image *) NULL ? MagickTrue : MagickFalse;
-
diff --git a/ImageMagick-6.7.3-2.tar.bz2 b/ImageMagick-6.7.3-2.tar.bz2
new file mode 100644
index 0000000..b5a6ebb
--- /dev/null
+++ b/ImageMagick-6.7.3-2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c0cea76a1f6155d2b590838d854c88a35239448fc7c68ab9dc3ffec1703fa80
+size 10405664
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 5a6fbe2..b25785f 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 31 13:51:57 UTC 2011 - pgajdos@suse.com
+
+- update to 6.7.3.2:
+  * removed upstreamed scene.patch
+
 -------------------------------------------------------------------
 Tue Oct 18 14:23:33 UTC 2011 - pgajdos@suse.com
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index dd9dff2..1f66160 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -90,8 +90,8 @@ BuildRequires:  librsvg-devel
 %endif
 
 %define xtp_version 5.4.3
-%define mfr_version 6.7.2
-%define mfr_revision 7
+%define mfr_version 6.7.3
+%define mfr_revision 2
 %define source_version %{mfr_version}-%{mfr_revision}
 License:        Public Domain, Freeware
 Group:          Productivity/Graphics/Other
@@ -113,7 +113,6 @@ Patch2:         ImageMagick-6.6.8.9-doc.patch
 # see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
 # for upstream progress
 Patch3:         ImageMagick-6.6.9.1-inc-struct.diff
-Patch4:         ImageMagick-6.7.2.7-scene.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       imagemag = %{version}
 Obsoletes:      imagemag < %{version}
@@ -209,7 +208,6 @@ rm -rf xtp-%{xtp_version}
 %patch1
 %patch2
 %patch3 -p1
-%patch4
 # remove together with inc-struct.diff     ----
 echo>header-test.c '#include "wand.h"'        #
 echo>wand.h '#include "wand/MagickWand.h"'    #
@@ -537,6 +535,10 @@ HTML documentation for ImageMagick library and scene examples.
 
 
 
+
+
+
+