diff --git a/ImageMagick-6.6.9-9.tar.bz2 b/ImageMagick-6.6.9-9.tar.bz2
deleted file mode 100644
index 7b1bf28..0000000
--- a/ImageMagick-6.6.9-9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5db6e2fd512cec2f6889cba001720ed67b6c37ef00fc7833270a9419e5e8b685
-size 10157812
diff --git a/ImageMagick-6.6.9.1-inc-struct.diff b/ImageMagick-6.6.9.1-inc-struct.diff
deleted file mode 100644
index ad31669..0000000
--- a/ImageMagick-6.6.9.1-inc-struct.diff
+++ /dev/null
@@ -1,828 +0,0 @@
-<<<<<<< .mine
-=======
-Only in old: AUTHORS.txt
-Only in old: ChangeLog
-Only in old: ImageMagick.spec.in
-Only in old: Install-mac.txt
-Only in old: Install-unix.txt
-Only in old: Install-vms.txt
-Only in old: Install-windows.txt
-Only in old: LICENSE
-Only in old: Magick++
-Only in old: Magickshr.opt
-Only in old: Make.com
-Only in old: Makefile.am
-Only in old: Makefile.in
-Only in old: NEWS.txt
-Only in old: NOTICE
-Only in old: PerlMagick
-Only in old: Platforms.txt
-Only in old: QuickStart.txt
-Only in old: README.txt
-Only in old: aclocal.m4
-Only in old: check-headers.c
-Only in old: coders
-Only in old: config
-Only in old: configure
-Only in old: configure.ac
-Only in old: filters
-Only in old: images
-Only in old: index.html
-Only in old: ltdl
-Only in old: m4
-Only in old/magick: ImageMagick.h
-Only in old/magick: ImageMagick.pc.in
-Only in old/magick: Magick-config.1
-Only in old/magick: Magick-config.in
-Only in old/magick: MagickCore-config.1
-Only in old/magick: MagickCore-config.in
-Index: ImageMagick-6.7.1-0/magick/MagickCore.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/MagickCore.h
-+++ ImageMagick-6.7.1-0/magick/MagickCore.h
-@@ -26,7 +26,7 @@ extern "C" {
- #if !defined(_MAGICKCORE_CONFIG_H)
- # define _MAGICKCORE_CONFIG_H
- # if !defined(vms) && !defined(macintosh)
--#  include "magick/magick-config.h"
-+#  include "magick-config.h"
- # else
- #  include "magick-config.h"
- # endif
-@@ -124,88 +124,88 @@ extern "C" {
- #if defined(MAGICKCORE_NAMESPACE_PREFIX)
- # include "magick/methods.h"
- #endif
--#include "magick/magick-type.h"
--#include "magick/accelerate.h"
--#include "magick/animate.h"
--#include "magick/annotate.h"
--#include "magick/artifact.h"
--#include "magick/attribute.h"
--#include "magick/blob.h"
--#include "magick/cache.h"
--#include "magick/cache-view.h"
--#include "magick/cipher.h"
--#include "magick/client.h"
--#include "magick/coder.h"
--#include "magick/color.h"
--#include "magick/colorspace.h"
--#include "magick/colormap.h"
--#include "magick/compare.h"
--#include "magick/composite.h"
--#include "magick/compress.h"
--#include "magick/configure.h"
--#include "magick/constitute.h"
--#include "magick/decorate.h"
--#include "magick/delegate.h"
--#include "magick/deprecate.h"
--#include "magick/display.h"
--#include "magick/distort.h"
--#include "magick/draw.h"
--#include "magick/effect.h"
--#include "magick/enhance.h"
--#include "magick/exception.h"
--#include "magick/feature.h"
--#include "magick/fourier.h"
--#include "magick/fx.h"
--#include "magick/gem.h"
--#include "magick/geometry.h"
--#include "magick/hashmap.h"
--#include "magick/histogram.h"
--#include "magick/identify.h"
--#include "magick/image.h"
--#include "magick/image-view.h"
--#include "magick/layer.h"
--#include "magick/list.h"
--#include "magick/locale_.h"
--#include "magick/log.h"
--#include "magick/magic.h"
--#include "magick/magick.h"
--#include "magick/matrix.h"
--#include "magick/memory_.h"
--#include "magick/module.h"
--#include "magick/mime.h"
--#include "magick/monitor.h"
--#include "magick/montage.h"
--#include "magick/morphology.h"
--#include "magick/option.h"
--#include "magick/paint.h"
--#include "magick/pixel.h"
--#include "magick/policy.h"
--#include "magick/prepress.h"
--#include "magick/profile.h"
--#include "magick/property.h"
--#include "magick/quantize.h"
--#include "magick/quantum.h"
--#include "magick/registry.h"
--#include "magick/random_.h"
--#include "magick/resample.h"
--#include "magick/resize.h"
--#include "magick/resource_.h"
--#include "magick/segment.h"
--#include "magick/shear.h"
--#include "magick/signature.h"
--#include "magick/splay-tree.h"
--#include "magick/stream.h"
--#include "magick/statistic.h"
--#include "magick/string_.h"
--#include "magick/timer.h"
--#include "magick/token.h"
--#include "magick/transform.h"
--#include "magick/threshold.h"
--#include "magick/type.h"
--#include "magick/utility.h"
--#include "magick/version.h"
--#include "magick/xml-tree.h"
--#include "magick/xwindow.h"
-+#include "magick-type.h"
-+#include "accelerate.h"
-+#include "animate.h"
-+#include "annotate.h"
-+#include "artifact.h"
-+#include "attribute.h"
-+#include "blob.h"
-+#include "cache.h"
-+#include "cache-view.h"
-+#include "cipher.h"
-+#include "client.h"
-+#include "coder.h"
-+#include "color.h"
-+#include "colorspace.h"
-+#include "colormap.h"
-+#include "compare.h"
-+#include "composite.h"
-+#include "compress.h"
-+#include "configure.h"
-+#include "constitute.h"
-+#include "decorate.h"
-+#include "delegate.h"
-+#include "deprecate.h"
-+#include "display.h"
-+#include "distort.h"
-+#include "draw.h"
-+#include "effect.h"
-+#include "enhance.h"
-+#include "exception.h"
-+#include "feature.h"
-+#include "fourier.h"
-+#include "fx.h"
-+#include "gem.h"
-+#include "geometry.h"
-+#include "hashmap.h"
-+#include "histogram.h"
-+#include "identify.h"
-+#include "image.h"
-+#include "image-view.h"
-+#include "layer.h"
-+#include "list.h"
-+#include "locale_.h"
-+#include "log.h"
-+#include "magic.h"
-+#include "magick.h"
-+#include "matrix.h"
-+#include "memory_.h"
-+#include "module.h"
-+#include "mime.h"
-+#include "monitor.h"
-+#include "montage.h"
-+#include "morphology.h"
-+#include "option.h"
-+#include "paint.h"
-+#include "pixel.h"
-+#include "policy.h"
-+#include "prepress.h"
-+#include "profile.h"
-+#include "property.h"
-+#include "quantize.h"
-+#include "quantum.h"
-+#include "registry.h"
-+#include "random_.h"
-+#include "resample.h"
-+#include "resize.h"
-+#include "resource_.h"
-+#include "segment.h"
-+#include "shear.h"
-+#include "signature.h"
-+#include "splay-tree.h"
-+#include "stream.h"
-+#include "statistic.h"
-+#include "string_.h"
-+#include "timer.h"
-+#include "token.h"
-+#include "transform.h"
-+#include "threshold.h"
-+#include "type.h"
-+#include "utility.h"
-+#include "version.h"
-+#include "xml-tree.h"
-+#include "xwindow.h"
- 
- #if defined(__cplusplus) || defined(c_plusplus)
- }
-Index: ImageMagick-6.7.1-0/magick/accelerate.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/accelerate.h
-+++ ImageMagick-6.7.1-0/magick/accelerate.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/morphology.h>
-+#include "morphology.h"
- 
- extern MagickExport MagickBooleanType
-   AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
-Index: ImageMagick-6.7.1-0/magick/annotate.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/annotate.h
-+++ ImageMagick-6.7.1-0/magick/annotate.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/draw.h"
-+#include "draw.h"
- 
- extern MagickExport MagickBooleanType
-   AnnotateComponentGenesis(void),
-Index: ImageMagick-6.7.1-0/magick/attribute.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/attribute.h
-+++ ImageMagick-6.7.1-0/magick/attribute.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/image.h>
--#include <magick/exception.h>
-+#include "image.h"
-+#include "exception.h"
- 
- extern MagickExport ImageType
-   GetImageType(const Image *,ExceptionInfo *);
-Index: ImageMagick-6.7.1-0/magick/blob.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/blob.h
-+++ ImageMagick-6.7.1-0/magick/blob.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "magick/image.h"
--#include "magick/stream.h"
-+#include "image.h"
-+#include "stream.h"
- 
- #define MagickMaxBufferExtent  (32*8192)
- 
-Index: ImageMagick-6.7.1-0/magick/cache-view.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/cache-view.h
-+++ ImageMagick-6.7.1-0/magick/cache-view.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/pixel.h"
-+#include "pixel.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/cache.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/cache.h
-+++ ImageMagick-6.7.1-0/magick/cache.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/blob.h"
-+#include "blob.h"
- 
- extern MagickExport const IndexPacket
-   *GetVirtualIndexQueue(const Image *);
-Index: ImageMagick-6.7.1-0/magick/color.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/color.h
-+++ ImageMagick-6.7.1-0/magick/color.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/pixel.h>
--#include <magick/exception.h>
-+#include "pixel.h"
-+#include "exception.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/compare.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/compare.h
-+++ ImageMagick-6.7.1-0/magick/compare.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/image.h"
-+#include "image.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/configure.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/configure.h
-+++ ImageMagick-6.7.1-0/magick/configure.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/hashmap.h"
-+#include "hashmap.h"
- 
- typedef struct _ConfigureInfo
- {
-Index: ImageMagick-6.7.1-0/magick/deprecate.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/deprecate.h
-+++ ImageMagick-6.7.1-0/magick/deprecate.h
-@@ -25,16 +25,16 @@ extern "C" {
- #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
- 
- #include <stdarg.h>
--#include "magick/blob.h"
--#include "magick/cache-view.h"
--#include "magick/draw.h"
--#include "magick/constitute.h"
--#include "magick/magick-config.h"
--#include "magick/pixel.h"
--#include "magick/quantize.h"
--#include "magick/quantum.h"
--#include "magick/registry.h"
--#include "magick/semaphore.h"
-+#include "blob.h"
-+#include "cache-view.h"
-+#include "draw.h"
-+#include "constitute.h"
-+#include "magick-config.h"
-+#include "pixel.h"
-+#include "quantize.h"
-+#include "quantum.h"
-+#include "registry.h"
-+#include "semaphore.h"
- 
- #if !defined(magick_attribute)
- #  if !defined(__GNUC__)
-Index: ImageMagick-6.7.1-0/magick/draw.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/draw.h
-+++ ImageMagick-6.7.1-0/magick/draw.h
-@@ -22,10 +22,10 @@
- extern "C" {
- #endif
- 
--#include "magick/geometry.h"
--#include "magick/image.h"
--#include "magick/pixel.h"
--#include "magick/type.h"
-+#include "geometry.h"
-+#include "image.h"
-+#include "pixel.h"
-+#include "type.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/effect.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/effect.h
-+++ ImageMagick-6.7.1-0/magick/effect.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/morphology.h>
-+#include "morphology.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/exception.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/exception.h
-+++ ImageMagick-6.7.1-0/magick/exception.h
-@@ -23,7 +23,7 @@ extern "C" {
- #endif
- 
- #include <stdarg.h>
--#include "magick/semaphore.h"
-+#include "semaphore.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/fx.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/fx.h
-+++ ImageMagick-6.7.1-0/magick/fx.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/draw.h"
-+#include "draw.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/gem.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/gem.h
-+++ ImageMagick-6.7.1-0/magick/gem.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/fx.h>
--#include <magick/random_.h>
-+#include "fx.h"
-+#include "random_.h"
- 
- extern MagickExport double
-   ExpandAffine(const AffineMatrix *),
-Index: ImageMagick-6.7.1-0/magick/image.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/image.h
-+++ ImageMagick-6.7.1-0/magick/image.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/color.h>
-+#include "color.h"
- 
- #define OpaqueOpacity  ((Quantum) 0UL)
- #define TransparentOpacity  ((Quantum) QuantumRange)
-@@ -125,25 +125,25 @@ typedef struct _ChromaticityInfo
-     white_point;
- } ChromaticityInfo;
- 
--#include "magick/blob.h"
--#include "magick/colorspace.h"
--#include "magick/cache-view.h"
--#include "magick/color.h"
--#include "magick/composite.h"
--#include "magick/compress.h"
--#include "magick/effect.h"
--#include "magick/geometry.h"
--#include "magick/layer.h"
--#include "magick/locale_.h"
--#include "magick/monitor.h"
--#include "magick/pixel.h"
--#include "magick/profile.h"
--#include "magick/quantum.h"
--#include "magick/resample.h"
--#include "magick/resize.h"
--#include "magick/semaphore.h"
--#include "magick/stream.h"
--#include "magick/timer.h"
-+#include "blob.h"
-+#include "colorspace.h"
-+#include "cache-view.h"
-+#include "color.h"
-+#include "composite.h"
-+#include "compress.h"
-+#include "effect.h"
-+#include "geometry.h"
-+#include "layer.h"
-+#include "locale_.h"
-+#include "monitor.h"
-+#include "pixel.h"
-+#include "profile.h"
-+#include "quantum.h"
-+#include "resample.h"
-+#include "resize.h"
-+#include "semaphore.h"
-+#include "stream.h"
-+#include "timer.h"
- 
- struct _Image
- {
-Index: ImageMagick-6.7.1-0/magick/locale_.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/locale_.h
-+++ ImageMagick-6.7.1-0/magick/locale_.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/hashmap.h"
-+#include "hashmap.h"
- 
- typedef struct _LocaleInfo
- {
-Index: ImageMagick-6.7.1-0/magick/log.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/log.h
-+++ ImageMagick-6.7.1-0/magick/log.h
-@@ -23,7 +23,7 @@ extern "C" {
- #endif
- 
- #include <stdarg.h>
--#include "magick/exception.h"
-+#include "exception.h"
- 
- #if !defined(GetMagickModule)
- # define GetMagickModule()  __FILE__,__func__,(unsigned long) __LINE__
-Index: ImageMagick-6.7.1-0/magick/magick-type.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/magick-type.h
-+++ ImageMagick-6.7.1-0/magick/magick-type.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/magick-config.h"
-+#include "magick-config.h"
- 
- #if !defined(MAGICKCORE_QUANTUM_DEPTH)
- #define MAGICKCORE_QUANTUM_DEPTH  16
-Index: ImageMagick-6.7.1-0/magick/module.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/module.h
-+++ ImageMagick-6.7.1-0/magick/module.h
-@@ -23,7 +23,7 @@ extern "C" {
- #endif
- 
- #include <time.h>
--#include "magick/version.h"
-+#include "version.h"
- 
- #define MagickImageCoderSignature  ((size_t) \
-   (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
-Index: ImageMagick-6.7.1-0/magick/morphology.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/morphology.h
-+++ ImageMagick-6.7.1-0/magick/morphology.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/geometry.h>
-+#include "geometry.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/paint.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/paint.h
-+++ ImageMagick-6.7.1-0/magick/paint.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "magick/color.h"
--#include "magick/draw.h"
-+#include "color.h"
-+#include "draw.h"
- 
- extern MagickExport Image
-   *OilPaintImage(const Image *,const double,ExceptionInfo *);
-Index: ImageMagick-6.7.1-0/magick/pixel.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/pixel.h
-+++ ImageMagick-6.7.1-0/magick/pixel.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/colorspace.h>
--#include <magick/constitute.h>
-+#include "colorspace.h"
-+#include "constitute.h"
- 
- #define ClampPixelRed(pixel) ClampToQuantum((pixel)->red)
- #define ClampPixelGreen(pixel) ClampToQuantum((pixel)->green)
-Index: ImageMagick-6.7.1-0/magick/policy.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/policy.h
-+++ ImageMagick-6.7.1-0/magick/policy.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/pixel.h>
--#include <magick/exception.h>
-+#include "pixel.h"
-+#include "exception.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/profile.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/profile.h
-+++ ImageMagick-6.7.1-0/magick/profile.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/string_.h"
-+#include "string_.h"
- 
- typedef struct _ProfileInfo
- {
-Index: ImageMagick-6.7.1-0/magick/quantize.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/quantize.h
-+++ ImageMagick-6.7.1-0/magick/quantize.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/colorspace.h"
-+#include "colorspace.h"
- 
- typedef enum
- {
-Index: ImageMagick-6.7.1-0/magick/quantum.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/quantum.h
-+++ ImageMagick-6.7.1-0/magick/quantum.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/semaphore.h"
-+#include "semaphore.h"
- 
- #define RoundToQuantum(quantum)  ClampToQuantum(quantum)
- 
-Index: ImageMagick-6.7.1-0/magick/random_.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/random_.h
-+++ ImageMagick-6.7.1-0/magick/random_.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/string_.h"
-+#include "string_.h"
- 
- /*
-   Typedef declarations.
-Index: ImageMagick-6.7.1-0/magick/resample.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/resample.h
-+++ ImageMagick-6.7.1-0/magick/resample.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/cache-view.h>
-+#include "cache-view.h"
- 
- /*
-   WARNING:  The order of this table must also match the order of a table
-Index: ImageMagick-6.7.1-0/magick/string_.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/string_.h
-+++ ImageMagick-6.7.1-0/magick/string_.h
-@@ -24,7 +24,7 @@ extern "C" {
- 
- #include <stdarg.h>
- #include <time.h>
--#include "magick/exception.h"
-+#include "exception.h"
- 
- typedef struct _StringInfo
- {
-Index: ImageMagick-6.7.1-0/magick/xml-tree.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/magick/xml-tree.h
-+++ ImageMagick-6.7.1-0/magick/xml-tree.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/exception.h>
--#include <magick/splay-tree.h>
-+#include "exception.h"
-+#include "splay-tree.h"
- 
- typedef struct _XMLTreeInfo
-   XMLTreeInfo;
-Index: ImageMagick-6.7.1-0/wand/MagickWand.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/wand/MagickWand.h
-+++ ImageMagick-6.7.1-0/wand/MagickWand.h
-@@ -26,7 +26,7 @@ extern "C" {
- #if !defined(_MAGICKWAND_CONFIG_H)
- # define _MAGICKWAND_CONFIG_H
- # if !defined(vms) && !defined(macintosh)
--#  include "magick/magick-config.h"
-+#  include "../magick/magick-config.h"
- # else
- #  include "magick-config.h"
- # endif
-@@ -124,25 +124,25 @@ extern "C" {
- typedef struct _MagickWand
-   MagickWand;
- 
--#include "magick/MagickCore.h"
--#include "wand/animate.h"
--#include "wand/compare.h"
--#include "wand/composite.h"
--#include "wand/conjure.h"
--#include "wand/convert.h"
--#include "wand/deprecate.h"
--#include "wand/display.h"
--#include "wand/drawing-wand.h"
--#include "wand/identify.h"
--#include "wand/import.h"
--#include "wand/magick-property.h"
--#include "wand/magick-image.h"
--#include "wand/mogrify.h"
--#include "wand/montage.h"
--#include "wand/pixel-iterator.h"
--#include "wand/pixel-wand.h"
--#include "wand/stream.h"
--#include "wand/wand-view.h"
-+#include "../magick/MagickCore.h"
-+#include "animate.h"
-+#include "compare.h"
-+#include "composite.h"
-+#include "conjure.h"
-+#include "convert.h"
-+#include "deprecate.h"
-+#include "display.h"
-+#include "drawing-wand.h"
-+#include "identify.h"
-+#include "import.h"
-+#include "magick-property.h"
-+#include "magick-image.h"
-+#include "mogrify.h"
-+#include "montage.h"
-+#include "pixel-iterator.h"
-+#include "pixel-wand.h"
-+#include "stream.h"
-+#include "wand-view.h"
- 
- extern WandExport char
-   *MagickGetException(const MagickWand *,ExceptionType *);
-Index: ImageMagick-6.7.1-0/wand/deprecate.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/wand/deprecate.h
-+++ ImageMagick-6.7.1-0/wand/deprecate.h
-@@ -24,10 +24,10 @@ extern "C" {
- 
- #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
- 
--#include "wand/drawing-wand.h"
--#include "wand/magick-wand.h"
--#include "wand/pixel-iterator.h"
--#include "wand/pixel-wand.h"
-+#include "drawing-wand.h"
-+#include "magick-wand.h"
-+#include "pixel-iterator.h"
-+#include "pixel-wand.h"
- 
- typedef struct _DrawingWand
-   *DrawContext;
-Index: ImageMagick-6.7.1-0/wand/drawing-wand.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/wand/drawing-wand.h
-+++ ImageMagick-6.7.1-0/wand/drawing-wand.h
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "wand/pixel-wand.h"
-+#include "pixel-wand.h"
- 
- typedef struct _DrawingWand
-   DrawingWand;
-Index: ImageMagick-6.7.1-0/wand/magick-wand.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/wand/magick-wand.h
-+++ ImageMagick-6.7.1-0/wand/magick-wand.h
-@@ -19,6 +19,6 @@
- #ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
- #define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
- 
--#include "wand/MagickWand.h"
-+#include "MagickWand.h"
- 
- #endif
-Index: ImageMagick-6.7.1-0/wand/pixel-iterator.h
-===================================================================
---- ImageMagick-6.7.1-0.orig/wand/pixel-iterator.h
-+++ ImageMagick-6.7.1-0/wand/pixel-iterator.h
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "wand/magick-wand.h"
--#include "wand/pixel-wand.h"
-+#include "magick-wand.h"
-+#include "pixel-wand.h"
- 
- typedef struct _PixelIterator
-   PixelIterator;
->>>>>>> .new
diff --git a/ImageMagick-6.6.9.8-inc-struct.diff b/ImageMagick-6.6.9.8-inc-struct.diff
deleted file mode 100644
index f057186..0000000
--- a/ImageMagick-6.6.9.8-inc-struct.diff
+++ /dev/null
@@ -1,1043 +0,0 @@
-Tylko w o: aclocal.m4
-Tylko w o: AUTHORS.txt
-Tylko w o: ChangeLog
-Tylko w o: coders
-Tylko w o: config
-Tylko w o: configure
-Tylko w o: configure.ac
-Tylko w o: configure.ac.orig
-Tylko w o: filters
-Tylko w o: ImageMagick.spec.in
-Tylko w o: images
-Tylko w o: index.html
-Tylko w o: Install-mac.txt
-Tylko w o: Install-unix.txt
-Tylko w o: Install-vms.txt
-Tylko w o: Install-windows.txt
-Tylko w o: LICENSE
-Tylko w o: ltdl
-Tylko w o: m4
-Tylko w o/magick: accelerate.c
-diff -aur o/magick/accelerate.h n/magick/accelerate.h
---- o/magick/accelerate.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/accelerate.h	2011-03-31 12:35:50.162999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/morphology.h>
-+#include "morphology.h"
- 
- extern MagickExport MagickBooleanType
-   AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
-Tylko w o/magick: animate.c
-Tylko w o/magick: animate.h
-Tylko w o/magick: animate-private.h
-Tylko w o/magick: annotate.c
-diff -aur o/magick/annotate.h n/magick/annotate.h
---- o/magick/annotate.h	2011-01-24 15:14:53.000000000 +0100
-+++ n/magick/annotate.h	2011-03-31 12:41:21.474999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/draw.h"
-+#include "draw.h"
- 
- extern MagickExport MagickBooleanType
-   AnnotateComponentGenesis(void),
-Tylko w o/magick: api.h
-Tylko w o/magick: artifact.c
-Tylko w o/magick: artifact.h
-Tylko w o/magick: attribute.c
-diff -aur o/magick/attribute.h n/magick/attribute.h
---- o/magick/attribute.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/attribute.h	2011-03-31 13:11:20.801999982 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/image.h>
--#include <magick/exception.h>
-+#include "image.h"
-+#include "exception.h"
- 
- extern MagickExport ImageType
-   GetImageType(const Image *,ExceptionInfo *);
-Tylko w o/magick: blob.c
-diff -aur o/magick/blob.h n/magick/blob.h
---- o/magick/blob.h	2011-02-07 01:33:21.000000000 +0100
-+++ n/magick/blob.h	2011-03-31 13:00:10.700999982 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "magick/image.h"
--#include "magick/stream.h"
-+#include "image.h"
-+#include "stream.h"
- 
- #define MagickMaxBufferExtent  (32*8192)
- 
-Tylko w o/magick: blob-private.h
-Tylko w o/magick: cache.c
-diff -aur o/magick/cache.h n/magick/cache.h
---- o/magick/cache.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/cache.h	2011-03-31 13:13:46.962999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/blob.h"
-+#include "blob.h"
- 
- extern MagickExport const IndexPacket
-   *GetVirtualIndexQueue(const Image *);
-Tylko w o/magick: cache-private.h
-Tylko w o/magick: cache-view.c
-diff -aur o/magick/cache-view.h n/magick/cache-view.h
---- o/magick/cache-view.h	2011-04-25 22:13:48.000000000 +0200
-+++ n/magick/cache-view.h	2011-05-14 19:31:15.630999974 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/pixel.h"
-+#include "pixel.h"
- 
- typedef enum
- {
-Tylko w o/magick: cipher.c
-Tylko w o/magick: cipher.h
-Tylko w o/magick: client.c
-Tylko w o/magick: client.h
-Tylko w o/magick: coder.c
-Tylko w o/magick: coder.h
-Tylko w o/magick: color.c
-diff -aur o/magick/color.h n/magick/color.h
---- o/magick/color.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/color.h	2011-03-31 12:50:26.252999982 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/pixel.h>
--#include <magick/exception.h>
-+#include "pixel.h"
-+#include "exception.h"
- 
- typedef enum
- {
-Tylko w o/magick: colormap.c
-Tylko w o/magick: colormap.h
-Tylko w o/magick: colormap-private.h
-Tylko w o/magick: color-private.h
-Tylko w o/magick: colorspace.c
-Tylko w o/magick: colorspace.h
-Tylko w o/magick: colorspace-private.h
-Tylko w o/magick: compare.c
-diff -aur o/magick/compare.h n/magick/compare.h
---- o/magick/compare.h	2010-12-11 03:17:57.000000000 +0100
-+++ n/magick/compare.h	2011-03-31 13:14:43.609999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/image.h"
-+#include "image.h"
- 
- typedef enum
- {
-Tylko w o/magick: composite.c
-Tylko w o/magick: composite.h
-Tylko w o/magick: composite-private.h
-Tylko w o/magick: compress.c
-Tylko w o/magick: compress.h
-Tylko w o/magick: config.h_vms
-Tylko w o/magick: configure.c
-diff -aur o/magick/configure.h n/magick/configure.h
---- o/magick/configure.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/configure.h	2011-03-31 13:15:58.705999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/hashmap.h"
-+#include "hashmap.h"
- 
- typedef struct _ConfigureInfo
- {
-Tylko w o/magick: constitute.c
-Tylko w o/magick: constitute.h
-Tylko w o/magick: decorate.c
-Tylko w o/magick: decorate.h
-Tylko w o/magick: delegate.c
-Tylko w o/magick: delegate.h
-Tylko w o/magick: delegate-private.h
-Tylko w o/magick: deprecate.c
-diff -aur o/magick/deprecate.h n/magick/deprecate.h
---- o/magick/deprecate.h	2011-03-18 22:29:28.000000000 +0100
-+++ n/magick/deprecate.h	2011-03-31 13:20:03.271999984 +0200
-@@ -25,16 +25,16 @@
- #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
- 
- #include <stdarg.h>
--#include "magick/blob.h"
--#include "magick/cache-view.h"
--#include "magick/draw.h"
--#include "magick/constitute.h"
--#include "magick/magick-config.h"
--#include "magick/pixel.h"
--#include "magick/quantize.h"
--#include "magick/quantum.h"
--#include "magick/registry.h"
--#include "magick/semaphore.h"
-+#include "blob.h"
-+#include "cache-view.h"
-+#include "draw.h"
-+#include "constitute.h"
-+#include "magick-config.h"
-+#include "pixel.h"
-+#include "quantize.h"
-+#include "quantum.h"
-+#include "registry.h"
-+#include "semaphore.h"
- 
- #if !defined(magick_attribute)
- #  if !defined(__GNUC__)
-Tylko w o/magick: display.c
-Tylko w o/magick: display.h
-Tylko w o/magick: display-private.h
-Tylko w o/magick: distort.c
-Tylko w o/magick: distort.h
-Tylko w o/magick: draw.c
-diff -aur o/magick/draw.h n/magick/draw.h
---- o/magick/draw.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/draw.h	2011-03-31 12:44:06.299999983 +0200
-@@ -22,10 +22,10 @@
- extern "C" {
- #endif
- 
--#include "magick/geometry.h"
--#include "magick/image.h"
--#include "magick/pixel.h"
--#include "magick/type.h"
-+#include "geometry.h"
-+#include "image.h"
-+#include "pixel.h"
-+#include "type.h"
- 
- typedef enum
- {
-Tylko w o/magick: draw-private.h
-Tylko w o/magick: effect.c
-diff -aur o/magick/effect.h n/magick/effect.h
---- o/magick/effect.h	2011-04-05 19:16:55.000000000 +0200
-+++ n/magick/effect.h	2011-05-14 19:23:27.643999877 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/morphology.h>
-+#include "morphology.h"
- 
- typedef enum
- {
-Tylko w o/magick: enhance.c
-Tylko w o/magick: enhance.h
-Tylko w o/magick: exception.c
-diff -aur o/magick/exception.h n/magick/exception.h
---- o/magick/exception.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/exception.h	2011-03-31 12:55:31.478999983 +0200
-@@ -23,7 +23,7 @@
- #endif
- 
- #include <stdarg.h>
--#include "magick/semaphore.h"
-+#include "semaphore.h"
- 
- typedef enum
- {
-Tylko w o/magick: exception-private.h
-Tylko w o/magick: feature.c
-Tylko w o/magick: feature.h
-Tylko w o/magick: fourier.c
-Tylko w o/magick: fourier.h
-Tylko w o/magick: fx.c
-diff -aur o/magick/fx.h n/magick/fx.h
---- o/magick/fx.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/fx.h	2011-03-31 13:21:46.152999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/draw.h"
-+#include "draw.h"
- 
- typedef enum
- {
-Tylko w o/magick: fx-private.h
-Tylko w o/magick: gem.c
-diff -aur o/magick/gem.h n/magick/gem.h
---- o/magick/gem.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/gem.h	2011-03-31 13:22:57.528999984 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/fx.h>
--#include <magick/random_.h>
-+#include "fx.h"
-+#include "random_.h"
- 
- extern MagickExport double
-   ExpandAffine(const AffineMatrix *),
-Tylko w o/magick: geometry.c
-Tylko w o/magick: geometry.h
-Tylko w o/magick: hashmap.c
-Tylko w o/magick: hashmap.h
-Tylko w o/magick: histogram.c
-Tylko w o/magick: histogram.h
-Tylko w o/magick: identify.c
-Tylko w o/magick: identify.h
-Tylko w o/magick: image.c
-diff -aur o/magick/image.h n/magick/image.h
---- o/magick/image.h	2011-04-25 22:33:58.000000000 +0200
-+++ n/magick/image.h	2011-05-14 19:25:27.016999974 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/color.h>
-+#include "color.h"
- 
- #define OpaqueOpacity  ((Quantum) 0UL)
- #define TransparentOpacity  ((Quantum) QuantumRange)
-@@ -125,24 +125,24 @@
-     white_point;
- } ChromaticityInfo;
- 
--#include "magick/blob.h"
--#include "magick/colorspace.h"
--#include "magick/cache-view.h"
--#include "magick/color.h"
--#include "magick/composite.h"
--#include "magick/compress.h"
--#include "magick/effect.h"
--#include "magick/geometry.h"
--#include "magick/layer.h"
--#include "magick/monitor.h"
--#include "magick/pixel.h"
--#include "magick/profile.h"
--#include "magick/quantum.h"
--#include "magick/resample.h"
--#include "magick/resize.h"
--#include "magick/semaphore.h"
--#include "magick/stream.h"
--#include "magick/timer.h"
-+#include "blob.h"
-+#include "colorspace.h"
-+#include "cache-view.h"
-+#include "color.h"
-+#include "composite.h"
-+#include "compress.h"
-+#include "effect.h"
-+#include "geometry.h"
-+#include "layer.h"
-+#include "monitor.h"
-+#include "pixel.h"
-+#include "profile.h"
-+#include "quantum.h"
-+#include "resample.h"
-+#include "resize.h"
-+#include "semaphore.h"
-+#include "stream.h"
-+#include "timer.h"
- 
- struct _Image
- {
-Tylko w o/magick: ImageMagick.h
-Tylko w o/magick: ImageMagick.pc.in
-Tylko w o/magick: image-private.h
-Tylko w o/magick: image-view.c
-Tylko w o/magick: image-view.h
-Tylko w o/magick: layer.c
-Tylko w o/magick: layer.h
-Tylko w o/magick: list.c
-Tylko w o/magick: list.h
-Tylko w o/magick: locale.c
-diff -aur o/magick/locale_.h n/magick/locale_.h
---- o/magick/locale_.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/locale_.h	2011-03-31 13:28:40.367999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/hashmap.h"
-+#include "hashmap.h"
- 
- typedef struct _LocaleInfo
- {
-Tylko w o/magick: log.c
-diff -aur o/magick/log.h n/magick/log.h
---- o/magick/log.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/log.h	2011-03-31 13:30:00.926999982 +0200
-@@ -23,7 +23,7 @@
- #endif
- 
- #include <stdarg.h>
--#include "magick/exception.h"
-+#include "exception.h"
- 
- #if !defined(GetMagickModule)
- # define GetMagickModule()  __FILE__,__func__,(unsigned long) __LINE__
-Tylko w o/magick: mac.c
-Tylko w o/magick: mac.h
-Tylko w o/magick: magic.c
-Tylko w o/magick: magic.h
-Tylko w o/magick: magick.c
-Tylko w o/magick: Magick-config.1
-Tylko w o/magick: magick-config.h
-Tylko w o/magick: Magick-config.in
-Tylko w o/magick: MagickCore-config.1
-Tylko w o/magick: MagickCore-config.in
-diff -aur o/magick/MagickCore.h n/magick/MagickCore.h
---- o/magick/MagickCore.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/MagickCore.h	2011-03-31 12:25:28.362999988 +0200
-@@ -26,7 +26,7 @@
- #if !defined(_MAGICKCORE_CONFIG_H)
- # define _MAGICKCORE_CONFIG_H
- # if !defined(vms) && !defined(macintosh)
--#  include "magick/magick-config.h"
-+#  include "magick-config.h"
- # else
- #  include "magick-config.h"
- # endif
-@@ -121,88 +121,88 @@
- #if defined(MAGICKCORE_NAMESPACE_PREFIX)
- # include "magick/methods.h"
- #endif
--#include "magick/magick-type.h"
--#include "magick/accelerate.h"
--#include "magick/animate.h"
--#include "magick/annotate.h"
--#include "magick/artifact.h"
--#include "magick/attribute.h"
--#include "magick/blob.h"
--#include "magick/cache.h"
--#include "magick/cache-view.h"
--#include "magick/cipher.h"
--#include "magick/client.h"
--#include "magick/coder.h"
--#include "magick/color.h"
--#include "magick/colorspace.h"
--#include "magick/colormap.h"
--#include "magick/compare.h"
--#include "magick/composite.h"
--#include "magick/compress.h"
--#include "magick/configure.h"
--#include "magick/constitute.h"
--#include "magick/decorate.h"
--#include "magick/delegate.h"
--#include "magick/deprecate.h"
--#include "magick/display.h"
--#include "magick/distort.h"
--#include "magick/draw.h"
--#include "magick/effect.h"
--#include "magick/enhance.h"
--#include "magick/exception.h"
--#include "magick/feature.h"
--#include "magick/fourier.h"
--#include "magick/fx.h"
--#include "magick/gem.h"
--#include "magick/geometry.h"
--#include "magick/hashmap.h"
--#include "magick/histogram.h"
--#include "magick/identify.h"
--#include "magick/image.h"
--#include "magick/image-view.h"
--#include "magick/layer.h"
--#include "magick/list.h"
--#include "magick/locale_.h"
--#include "magick/log.h"
--#include "magick/magic.h"
--#include "magick/magick.h"
--#include "magick/matrix.h"
--#include "magick/memory_.h"
--#include "magick/module.h"
--#include "magick/mime.h"
--#include "magick/monitor.h"
--#include "magick/montage.h"
--#include "magick/morphology.h"
--#include "magick/option.h"
--#include "magick/paint.h"
--#include "magick/pixel.h"
--#include "magick/policy.h"
--#include "magick/prepress.h"
--#include "magick/profile.h"
--#include "magick/property.h"
--#include "magick/quantize.h"
--#include "magick/quantum.h"
--#include "magick/registry.h"
--#include "magick/random_.h"
--#include "magick/resample.h"
--#include "magick/resize.h"
--#include "magick/resource_.h"
--#include "magick/segment.h"
--#include "magick/shear.h"
--#include "magick/signature.h"
--#include "magick/splay-tree.h"
--#include "magick/stream.h"
--#include "magick/statistic.h"
--#include "magick/string_.h"
--#include "magick/timer.h"
--#include "magick/token.h"
--#include "magick/transform.h"
--#include "magick/threshold.h"
--#include "magick/type.h"
--#include "magick/utility.h"
--#include "magick/version.h"
--#include "magick/xml-tree.h"
--#include "magick/xwindow.h"
-+#include "magick-type.h"
-+#include "accelerate.h"
-+#include "animate.h"
-+#include "annotate.h"
-+#include "artifact.h"
-+#include "attribute.h"
-+#include "blob.h"
-+#include "cache.h"
-+#include "cache-view.h"
-+#include "cipher.h"
-+#include "client.h"
-+#include "coder.h"
-+#include "color.h"
-+#include "colorspace.h"
-+#include "colormap.h"
-+#include "compare.h"
-+#include "composite.h"
-+#include "compress.h"
-+#include "configure.h"
-+#include "constitute.h"
-+#include "decorate.h"
-+#include "delegate.h"
-+#include "deprecate.h"
-+#include "display.h"
-+#include "distort.h"
-+#include "draw.h"
-+#include "effect.h"
-+#include "enhance.h"
-+#include "exception.h"
-+#include "feature.h"
-+#include "fourier.h"
-+#include "fx.h"
-+#include "gem.h"
-+#include "geometry.h"
-+#include "hashmap.h"
-+#include "histogram.h"
-+#include "identify.h"
-+#include "image.h"
-+#include "image-view.h"
-+#include "layer.h"
-+#include "list.h"
-+#include "locale_.h"
-+#include "log.h"
-+#include "magic.h"
-+#include "magick.h"
-+#include "matrix.h"
-+#include "memory_.h"
-+#include "module.h"
-+#include "mime.h"
-+#include "monitor.h"
-+#include "montage.h"
-+#include "morphology.h"
-+#include "option.h"
-+#include "paint.h"
-+#include "pixel.h"
-+#include "policy.h"
-+#include "prepress.h"
-+#include "profile.h"
-+#include "property.h"
-+#include "quantize.h"
-+#include "quantum.h"
-+#include "registry.h"
-+#include "random_.h"
-+#include "resample.h"
-+#include "resize.h"
-+#include "resource_.h"
-+#include "segment.h"
-+#include "shear.h"
-+#include "signature.h"
-+#include "splay-tree.h"
-+#include "stream.h"
-+#include "statistic.h"
-+#include "string_.h"
-+#include "timer.h"
-+#include "token.h"
-+#include "transform.h"
-+#include "threshold.h"
-+#include "type.h"
-+#include "utility.h"
-+#include "version.h"
-+#include "xml-tree.h"
-+#include "xwindow.h"
- 
- #if defined(__cplusplus) || defined(c_plusplus)
- }
-Tylko w o/magick: MagickCore.pc.in
-Tylko w o/magick: magick.h
-diff -aur o/magick/magick-type.h n/magick/magick-type.h
---- o/magick/magick-type.h	2011-04-26 16:56:14.000000000 +0200
-+++ n/magick/magick-type.h	2011-05-14 19:27:18.268999974 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/magick-config.h"
-+#include "magick-config.h"
- 
- #if !defined(MAGICKCORE_QUANTUM_DEPTH)
- #define MAGICKCORE_QUANTUM_DEPTH  16
-Tylko w o/magick: Make.com
-Tylko w o/magick: Makefile.am
-Tylko w o/magick: matrix.c
-Tylko w o/magick: matrix.h
-Tylko w o/magick: memory.c
-Tylko w o/magick: memory_.h
-Tylko w o/magick: methods.h
-Tylko w o/magick: mime.c
-Tylko w o/magick: mime.h
-Tylko w o/magick: mime-private.h
-Tylko w o/magick: module.c
-diff -aur o/magick/module.h n/magick/module.h
---- o/magick/module.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/module.h	2011-03-31 13:31:08.974999982 +0200
-@@ -23,7 +23,7 @@
- #endif
- 
- #include <time.h>
--#include "magick/version.h"
-+#include "version.h"
- 
- #define MagickImageCoderSignature  ((size_t) \
-   (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
-Tylko w o/magick: monitor.c
-Tylko w o/magick: monitor.h
-Tylko w o/magick: monitor-private.h
-Tylko w o/magick: montage.c
-Tylko w o/magick: montage.h
-Tylko w o/magick: morphology.c
-diff -aur o/magick/morphology.h n/magick/morphology.h
---- o/magick/morphology.h	2011-04-27 15:18:00.000000000 +0200
-+++ n/magick/morphology.h	2011-05-14 19:28:21.108000046 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/geometry.h>
-+#include "geometry.h"
- 
- typedef enum
- {
-Tylko w o/magick: morphology-private.h
-Tylko w o/magick: nt-base.c
-Tylko w o/magick: nt-base.h
-Tylko w o/magick: nt-feature.c
-Tylko w o/magick: nt-feature.h
-Tylko w o/magick: option.c
-Tylko w o/magick: option.h
-Tylko w o/magick: paint.c
-diff -aur o/magick/paint.h n/magick/paint.h
---- o/magick/paint.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/paint.h	2011-03-31 13:32:55.811999983 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "magick/color.h"
--#include "magick/draw.h"
-+#include "color.h"
-+#include "draw.h"
- 
- extern MagickExport Image
-   *OilPaintImage(const Image *,const double,ExceptionInfo *);
-Tylko w o/magick: pixel.c
-diff -aur o/magick/pixel.h n/magick/pixel.h
---- o/magick/pixel.h	2011-05-05 01:03:43.000000000 +0200
-+++ n/magick/pixel.h	2011-05-14 19:29:42.929000053 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/colorspace.h>
--#include <magick/constitute.h>
-+#include "colorspace.h"
-+#include "constitute.h"
- 
- #define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
- #define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
-Tylko w o/magick: pixel-private.h
-Tylko w o/magick: policy.c
-diff -aur o/magick/policy.h n/magick/policy.h
---- o/magick/policy.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/policy.h	2011-03-31 13:34:07.600999982 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/pixel.h>
--#include <magick/exception.h>
-+#include "pixel.h"
-+#include "exception.h"
- 
- typedef enum
- {
-Tylko w o/magick: prepress.c
-Tylko w o/magick: prepress.h
-Tylko w o/magick: PreRvIcccm.c
-Tylko w o/magick: PreRvIcccm.h
-Tylko w o/magick: profile.c
-diff -aur o/magick/profile.h n/magick/profile.h
---- o/magick/profile.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/profile.h	2011-03-31 13:04:38.757999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/string_.h"
-+#include "string_.h"
- 
- typedef struct _ProfileInfo
- {
-Tylko w o/magick: property.c
-Tylko w o/magick: property.h
-Tylko w o/magick: quantize.c
-diff -aur o/magick/quantize.h n/magick/quantize.h
---- o/magick/quantize.h	2011-02-09 16:12:01.000000000 +0100
-+++ n/magick/quantize.h	2011-03-31 13:19:00.915999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/colorspace.h"
-+#include "colorspace.h"
- 
- typedef enum
- {
-Tylko w o/magick: quantum.c
-Tylko w o/magick: quantum-export.c
-diff -aur o/magick/quantum.h n/magick/quantum.h
---- o/magick/quantum.h	2010-08-23 15:37:35.000000000 +0200
-+++ n/magick/quantum.h	2011-03-31 13:08:37.374999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/semaphore.h"
-+#include "semaphore.h"
- 
- #define RoundToQuantum(quantum)  ClampToQuantum(quantum)
- 
-Tylko w o/magick: quantum-import.c
-Tylko w o/magick: quantum-private.h
-Tylko w o/magick: random.c
-diff -aur o/magick/random_.h n/magick/random_.h
---- o/magick/random_.h	2011-02-25 03:43:54.000000000 +0100
-+++ n/magick/random_.h	2011-03-31 13:24:51.373999982 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "magick/string_.h"
-+#include "string_.h"
- 
- /*
-   Typedef declarations.
-Tylko w o/magick: random-private.h
-Tylko w o/magick: registry.c
-Tylko w o/magick: registry.h
-Tylko w o/magick: resample.c
-diff -aur o/magick/resample.h n/magick/resample.h
---- o/magick/resample.h	2011-03-26 01:21:26.000000000 +0100
-+++ n/magick/resample.h	2011-03-31 13:10:02.794999984 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include <magick/cache-view.h>
-+#include "cache-view.h"
- 
- /*
-   WARNING:  The order of this table must also match the order of a table
-Tylko w o/magick: resample-private.h
-Tylko w o/magick: resize.c
-Tylko w o/magick: resize.h
-Tylko w o/magick: resize-private.h
-Tylko w o/magick: resource.c
-Tylko w o/magick: resource_.h
-Tylko w o/magick: segment.c
-Tylko w o/magick: segment.h
-Tylko w o/magick: semaphore.c
-Tylko w o/magick: semaphore.h
-Tylko w o/magick: semaphore-private.h
-Tylko w o/magick: shear.c
-Tylko w o/magick: shear.h
-Tylko w o/magick: signature.c
-Tylko w o/magick: signature.h
-Tylko w o/magick: signature-private.h
-Tylko w o/magick: splay-tree.c
-Tylko w o/magick: splay-tree.h
-Tylko w o/magick: static.c
-Tylko w o/magick: static.h
-Tylko w o/magick: statistic.c
-Tylko w o/magick: statistic.h
-Tylko w o/magick: stream.c
-Tylko w o/magick: stream.h
-Tylko w o/magick: stream-private.h
-Tylko w o/magick: string.c
-diff -aur o/magick/string_.h n/magick/string_.h
---- o/magick/string_.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/string_.h	2011-03-31 13:06:47.113999983 +0200
-@@ -24,7 +24,7 @@
- 
- #include <stdarg.h>
- #include <time.h>
--#include "magick/exception.h"
-+#include "exception.h"
- 
- typedef struct _StringInfo
- {
-Tylko w o/magick: string-private.h
-Tylko w o/magick: studio.h
-Tylko w o/magick: thread.c
-Tylko w o/magick: thread_.h
-Tylko w o/magick: thread-private.h
-Tylko w o/magick: threshold.c
-Tylko w o/magick: threshold.h
-Tylko w o/magick: timer.c
-Tylko w o/magick: timer.h
-Tylko w o/magick: token.c
-Tylko w o/magick: token.h
-Tylko w o/magick: token-private.h
-Tylko w o/magick: transform.c
-Tylko w o/magick: transform.h
-Tylko w o/magick: type.c
-Tylko w o/magick: type.h
-Tylko w o/magick: utility.c
-Tylko w o/magick: utility.h
-Tylko w o/magick: version.c
-Tylko w o/magick: version.h
-Tylko w o/magick: version.h.in
-Tylko w o/magick: vms.c
-Tylko w o/magick: vms.h
-Tylko w o/magick: widget.c
-Tylko w o/magick: widget.h
-Tylko w o/magick: xml-tree.c
-diff -aur o/magick/xml-tree.h n/magick/xml-tree.h
---- o/magick/xml-tree.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/magick/xml-tree.h	2011-03-31 13:35:32.189999983 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include <magick/exception.h>
--#include <magick/splay-tree.h>
-+#include "exception.h"
-+#include "splay-tree.h"
- 
- typedef struct _XMLTreeInfo
-   XMLTreeInfo;
-Tylko w o/magick: xwdfile.h_vms
-Tylko w o/magick: xwindow.c
-Tylko w o/magick: xwindow.h
-Tylko w o/magick: xwindow-private.h
-Tylko w o: Magick++
-Tylko w o: magick.sh.in
-Tylko w o: Magickshr.opt
-Tylko w o: Make.com
-Tylko w o: Makefile.am
-Tylko w o: Makefile.in
-Tylko w o: NEWS.txt
-Tylko w o: NOTICE
-Tylko w o: PerlMagick
-Tylko w o: Platforms.txt
-Tylko w o: QuickStart.txt
-Tylko w o: README.txt
-Tylko w o: scenes
-Tylko w o: scripts
-Tylko w o: tests
-Tylko w o: utilities
-Tylko w o: version.sh
-Tylko w o/wand: animate.c
-Tylko w o/wand: animate.h
-Tylko w o/wand: ChangeLog
-Tylko w o/wand: common.sh
-Tylko w o/wand: compare.c
-Tylko w o/wand: compare.h
-Tylko w o/wand: composite.c
-Tylko w o/wand: composite.h
-Tylko w o/wand: conjure.c
-Tylko w o/wand: conjure.h
-Tylko w o/wand: convert.c
-Tylko w o/wand: convert.h
-Tylko w o/wand: deprecate.c
-diff -aur o/wand/deprecate.h n/wand/deprecate.h
---- o/wand/deprecate.h	2011-03-18 22:29:28.000000000 +0100
-+++ n/wand/deprecate.h	2011-03-31 13:53:46.751999982 +0200
-@@ -24,10 +24,10 @@
- 
- #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
- 
--#include "wand/drawing-wand.h"
--#include "wand/magick-wand.h"
--#include "wand/pixel-iterator.h"
--#include "wand/pixel-wand.h"
-+#include "drawing-wand.h"
-+#include "magick-wand.h"
-+#include "pixel-iterator.h"
-+#include "pixel-wand.h"
- 
- typedef struct _DrawingWand
-   *DrawContext;
-Tylko w o/wand: display.c
-Tylko w o/wand: display.h
-Tylko w o/wand: drawing-wand.c
-diff -aur o/wand/drawing-wand.h n/wand/drawing-wand.h
---- o/wand/drawing-wand.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/wand/drawing-wand.h	2011-03-31 13:49:19.628999983 +0200
-@@ -22,7 +22,7 @@
- extern "C" {
- #endif
- 
--#include "wand/pixel-wand.h"
-+#include "pixel-wand.h"
- 
- typedef struct _DrawingWand
-   DrawingWand;
-Tylko w o/wand: drawtest.c
-Tylko w o/wand: drawtest.sh
-Tylko w o/wand: identify.c
-Tylko w o/wand: identify.h
-Tylko w o/wand: import.c
-Tylko w o/wand: import.h
-Tylko w o/wand: input_256c.miff
-Tylko w o/wand: input_bilevel.miff
-Tylko w o/wand: input_gray.miff
-Tylko w o/wand: input_truecolor.miff
-Tylko w o/wand: magick-image.c
-Tylko w o/wand: magick-image.h
-Tylko w o/wand: magick-property.c
-Tylko w o/wand: magick-property.h
-Tylko w o/wand: magick-wand.c
-Tylko w o/wand: MagickWand-config.1
-Tylko w o/wand: MagickWand-config.in
-Tylko w o/wand: magick_wand.h
-diff -aur o/wand/magick-wand.h n/wand/magick-wand.h
---- o/wand/magick-wand.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/wand/magick-wand.h	2011-03-31 13:54:46.686999982 +0200
-@@ -19,6 +19,6 @@
- #ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
- #define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
- 
--#include "wand/MagickWand.h"
-+#include "MagickWand.h"
- 
- #endif
-diff -aur o/wand/MagickWand.h n/wand/MagickWand.h
---- o/wand/MagickWand.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/wand/MagickWand.h	2011-03-31 13:51:32.821999982 +0200
-@@ -26,7 +26,7 @@
- #if !defined(_MAGICKWAND_CONFIG_H)
- # define _MAGICKWAND_CONFIG_H
- # if !defined(vms) && !defined(macintosh)
--#  include "magick/magick-config.h"
-+#  include "../magick/magick-config.h"
- # else
- #  include "magick-config.h"
- # endif
-@@ -121,25 +121,25 @@
- typedef struct _MagickWand
-   MagickWand;
- 
--#include "magick/MagickCore.h"
--#include "wand/animate.h"
--#include "wand/compare.h"
--#include "wand/composite.h"
--#include "wand/conjure.h"
--#include "wand/convert.h"
--#include "wand/deprecate.h"
--#include "wand/display.h"
--#include "wand/drawing-wand.h"
--#include "wand/identify.h"
--#include "wand/import.h"
--#include "wand/magick-property.h"
--#include "wand/magick-image.h"
--#include "wand/mogrify.h"
--#include "wand/montage.h"
--#include "wand/pixel-iterator.h"
--#include "wand/pixel-wand.h"
--#include "wand/stream.h"
--#include "wand/wand-view.h"
-+#include "../magick/MagickCore.h"
-+#include "animate.h"
-+#include "compare.h"
-+#include "composite.h"
-+#include "conjure.h"
-+#include "convert.h"
-+#include "deprecate.h"
-+#include "display.h"
-+#include "drawing-wand.h"
-+#include "identify.h"
-+#include "import.h"
-+#include "magick-property.h"
-+#include "magick-image.h"
-+#include "mogrify.h"
-+#include "montage.h"
-+#include "pixel-iterator.h"
-+#include "pixel-wand.h"
-+#include "stream.h"
-+#include "wand-view.h"
- 
- extern WandExport char
-   *MagickGetException(const MagickWand *,ExceptionType *);
-Tylko w o/wand: MagickWand.pc.in
-Tylko w o/wand: magick-wand-private.h
-Tylko w o/wand: Makefile.am
-Tylko w o/wand: mogrify.c
-Tylko w o/wand: mogrify.h
-Tylko w o/wand: mogrify-private.h
-Tylko w o/wand: montage.c
-Tylko w o/wand: montage.h
-Tylko w o/wand: pixel-iterator.c
-diff -aur o/wand/pixel-iterator.h n/wand/pixel-iterator.h
---- o/wand/pixel-iterator.h	2010-12-05 00:12:08.000000000 +0100
-+++ n/wand/pixel-iterator.h	2011-03-31 13:56:23.775999983 +0200
-@@ -22,8 +22,8 @@
- extern "C" {
- #endif
- 
--#include "wand/magick-wand.h"
--#include "wand/pixel-wand.h"
-+#include "magick-wand.h"
-+#include "pixel-wand.h"
- 
- typedef struct _PixelIterator
-   PixelIterator;
-Tylko w o/wand: pixel-wand.c
-Tylko w o/wand: pixel-wand.h
-Tylko w o/wand: pixel-wand-private.h
-Tylko w o/wand: sequence.miff
-Tylko w o/wand: stream.c
-Tylko w o/wand: stream.h
-Tylko w o/wand: studio.h
-Tylko w o/wand: wand.c
-Tylko w o/wand: Wand-config.1
-Tylko w o/wand: Wand-config.in
-Tylko w o/wand: wand.h
-Tylko w o/wand: Wand.pc.in
-Tylko w o/wand: wandtest.c
-Tylko w o/wand: wandtest.sh
-Tylko w o/wand: wand-view.c
-Tylko w o/wand: wand-view.h
-Tylko w o: winpath.sh
-Tylko w o: www
diff --git a/ImageMagick-6.7.4-7.tar.bz2 b/ImageMagick-6.7.4-7.tar.bz2
deleted file mode 100644
index 5d4fe37..0000000
--- a/ImageMagick-6.7.4-7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd3275418baf033bbd356f2f95fa8ded27b22ac572b6f7f9b69a1103dfafb649
-size 10402402
diff --git a/ImageMagick-6.7.6-1.tar.bz2 b/ImageMagick-6.7.6-1.tar.bz2
new file mode 100644
index 0000000..fd58ab5
--- /dev/null
+++ b/ImageMagick-6.7.6-1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb96ebd585f8a3e0c4638fc6383ef6fedcb2f36783c0a90ff8e2c95af20f9baa
+size 10417616
diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch
new file mode 100644
index 0000000..c9a06c4
--- /dev/null
+++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch
@@ -0,0 +1,13 @@
+Index: ImageMagick-6.7.6-1/configure.ac
+===================================================================
+--- ImageMagick-6.7.6-1.orig/configure.ac
++++ ImageMagick-6.7.6-1/configure.ac
+@@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
+ # Ensure that make can run correctly
+ AM_SANITY_CHECK
+ 
+-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
++AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip])
+ 
+ # Enable support for silent build rules
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 01504bd..984ea83 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Mar 27 16:20:53 UTC 2012 - pgajdos@suse.com
+
+- cleanup the package
+- updated to 6.7.6.1: fixes
+  * CVE-2012-0247 [bnc#746880]
+  * CVE-2012-0248 [bnc#746880]
+  * CVE-2012-1185 [bnc#752879]
+  * CVE-2012-1186 [bnc#752879]
+
 -------------------------------------------------------------------
 Fri Mar  9 9:4:11 UTC 2012 - giecrilj@stegny.2a.pl
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index ad4f43f..4d9762f 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -16,122 +16,48 @@
 #
 
 
-%bcond_with xtp
-%bcond_without DCraw
-%bcond_without FreeType
-%bcond_without CXX
-%bcond_without Ghostscript
-%bcond_without LCMS
-%bcond_without TIFF
-%bcond_without WMF
-%bcond_without XML
-%bcond_without DejaVu
-%bcond_without EXIF
-%bcond_without JPEG
-%bcond_without WEBP
-# build against librsvg [bnc#724222]
-%bcond_without RSVG 
 
 Name:           ImageMagick
-%define xtp_version 5.4.3
-%define mfr_version 6.6.9
-%define mfr_revision 9
-%define source_version %{mfr_version}-%{mfr_revision}
-%define source_locator http://image_magick.veidrodis.com/image_magick/ImageMagick-%{source_version}.tar.bz2
-
-License:        Apache-2.0
-Group:          Productivity/Graphics/Other
-AutoReqProv:    on
-Version:        %{mfr_version}.%{mfr_revision}
-Release:        0
-%define libver  4
-Summary:        Viewer and Converter for Images
-Url:            http://www.imagemagick.org
 
 BuildRequires:  fdupes
 BuildRequires:  libbz2-devel
 BuildRequires:  libtool
 BuildRequires:  lzma-devel
 BuildRequires:  pkgconfig
-%if %{with DCraw}
 BuildRequires:  dcraw
-%endif
-
-%if %{with FreeType}
 BuildRequires:  freetype2-devel
-%endif
-
-%if %{with CXX}
 BuildRequires:  gcc-c++
-%endif
-
-%if %{with Ghostscript}
 BuildRequires:  ghostscript-fonts-other
 BuildRequires:  ghostscript-fonts-std
 BuildRequires:  ghostscript-library
-%endif
-
-%if %{with LCMS}
 BuildRequires:  liblcms2-devel
-%endif
-
-%if %{with TIFF}
 BuildRequires:  libtiff-devel
-%endif
-
-%if %{with WMF}
 BuildRequires:  libwmf-devel
-%endif
-
-%if %{with XML}
 BuildRequires:  libxml2-devel
-%endif
-
-%if %{with DejaVu}
 BuildRequires:  libdjvulibre-devel
-%endif
-
-%if %{with EXIF}
 BuildRequires:  libexif-devel
-%endif
-
-%if %{with JPEG}
 BuildRequires:  libjasper-devel
-%endif
-
-%if %{with WEBP}
 BuildRequires:  libwebp-devel
-%endif
-
-%if %{with RSVG}
 BuildRequires:  librsvg-devel
-%endif
 
-%define xtp_version 5.4.3
-%define mfr_version 6.7.4
-%define mfr_revision 7
+%define mfr_version 6.7.6
+%define mfr_revision 1
 %define source_version %{mfr_version}-%{mfr_revision}
+Version:        %{mfr_version}.%{mfr_revision}
+Release:        0
 %define libver  5
 Summary:        Viewer and Converter for Images
+License:        SUSE-ImageMagick
 Group:          Productivity/Graphics/Other
-Source:         http://image_magick.veidrodis.com/image_magick/ImageMagick-%{source_version}.tar.bz2
+Url:            http://www.imagemagick.org
+Source:         ImageMagick-%{source_version}.tar.bz2
 # To get mtime of file
 Source1:        ImageMagick.changes
-%if %{with xtp}
-Source2:        xtp-%{xtp_version}.tar.bz2
-%endif
-Source3:        baselibs.conf
-Source4:        wlb.tar.bz
+Source2:        baselibs.conf
 Patch1:         ImageMagick-6.6.8.9-examples.patch
 Patch2:         ImageMagick-6.6.8.9-doc.patch
-# remove inc-struct.diff as soon as it will be not comfortable to port
-# 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
+Patch3:         ImageMagick-6.7.6.1-no-dist-lzip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Provides:       imagemag = %{version}
-Obsoletes:      imagemag < %{version}
-Recommends:     %{name}-doc = %{version}
 
 %package -n perl-PerlMagick
 Requires:       perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
@@ -173,74 +99,37 @@ Requires:       ImageMagick
 Summary:        C++ Interface for ImageMagick - runtime library
 License:        SUSE-ImageMagick
 Group:          Development/Libraries/C and C++
-# was last used in openSUSE 10.2
-Provides:       ImageMagick-Magick++ = %{version}
-Obsoletes:      ImageMagick-Magick++ < %{version}
 
 %package -n libMagick++-devel
 Requires:       ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel
 Summary:        C++ Interface for ImageMagick - files mandatory for development
 License:        SUSE-ImageMagick
 Group:          Development/Libraries/C and C++
-Provides:       ImageMagick-Magick++-devel = %{version}
-Obsoletes:      ImageMagick-Magick++-devel < %{version}
 
 %package doc
-Summary:        ImageMagick application suite documentation
+Summary:        Document Files for ImageMagick Library
 License:        SUSE-ImageMagick
-Group:          Documentation/HTML
+Group:          Development/Libraries/C and C++
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
 
-%if !0%{?make_jobs:1}
-%define make_jobs %{__make} %{?_smp_mflags} V=1
-%endif
-
 %prep
-rm -rf xtp-%{xtp_version}
-%if %{with xtp}
-%setup -n ImageMagick-%{source_version} -b 2
-%else
-%setup -n ImageMagick-%{source_version} -a 4
-%endif
+%setup -n ImageMagick-%{source_version}
 %patch1
 %patch2
 %patch3 -p1
-# remove together with inc-struct.diff     ----
-echo>header-test.c '#include "wand.h"'        #
-echo>wand.h '#include "wand/MagickWand.h"'    #
-%{make_jobs} header-test.o                       #
-chmod a-x PerlMagick/demo/*
-# move demo out of libtool operation
-%fdupes Magick++/demo
-%{__cp} -R -twww/Magick++ Magick++/demo 
 
 %build
-%define CFLAGS ${RPM_OPT_FLAGS}
-%define LDFLAGS -L%{_libdir}
-%define system_ltdl 0
-%if %system_ltdl
-cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl
-mv ltdl/ltdl.c ltdl/ltdl.c.orig
-sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c
-%endif
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="-L%{_libdir}"
 CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10`
 # Use mtime of .changes for build time
 sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh
 
 autoreconf --force --install -v
 
-%if %{with xtp}
-pushd ../xtp-%{xtp_version}
-autoreconf --force --install
-popd
-%endif
-
-%if %{suse_version} <= 1030
-# openmp does not work with perl module
-  OPENMP="--disable-openmp"
-%endif
 %configure --with-pic \
   --enable-shared \
   --without-frozenpaths \
@@ -249,44 +138,35 @@ popd
   --with-threads \
   --without-perl \
   --disable-static \
-  --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
-%{make_jobs} all
+  --with-djvu=yes \
+  --with-wmf=yes
+make %{?_smp_mflags} all
 cd PerlMagick
 perl Makefile.PL
-%{make_jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
-#
-%if %{with xtp}
-cd ../../xtp-%{xtp_version}
-%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}"
-%{make_jobs}
-%endif
+make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
 
 %check
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
 export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs
 export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs
 export MAGICK_CONFIGURE_PATH=$PWD/config
-# LANG set to a value that used to crash IM
-LANG=pl_PL.UTF-8 %{make_jobs} check
 cd PerlMagick
-%{make_jobs} test
+make test
 
 %install
 %{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images'
-%{makeinstall} \
+%{__make} install \
      DESTDIR=$RPM_BUILD_ROOT \
      pkgdocdir=%{_defaultdocdir}/%{name}/
 cd PerlMagick
-%{make_jobs} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor
+%{__make} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor
 %perl_process_packlist
+cd '../Magick++'
+  %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} 
+  PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';'
+  %{__mv} demo/makefile.2 demo/Makefile
 cd ..
 
-%if %{with xtp}
-pushd ../xtp-%{xtp_version}
-  %{make_jobs} DESTDIR=$RPM_BUILD_ROOT install 
-popd
-%endif
-
 %{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml  
 %{__cp} -a -t "${RPM_BUILD_ROOT}"'%{_defaultdocdir}/%{name}/' scenes
 PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
@@ -295,7 +175,8 @@ PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
 %{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la
 echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"'
 %if 0%{?suse_version} > 1020
-%fdupes '%{buildroot}%{_prefix}'
+%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand
+%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api
 %endif
 rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 
@@ -313,30 +194,28 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 
 %files
 %defattr(-,root,root)
+%docdir %{_docdir}/%{name}
 %doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
 %{_bindir}/[^MW]*
 %doc %{_mandir}/man1/*
 %exclude %{_mandir}/man1/*-config.1.gz
-# moved to doc
-%exclude %{_docdir}/*
-
-%dir %{_sysconfdir}/ImageMagick*
-%config %{_sysconfdir}/ImageMagick*/*
-%dir %{_libdir}/ImageMagick*
-%dir %{_libdir}/ImageMagick*/modules*
-%dir %{_libdir}/ImageMagick*/modules*/*
-%{_libdir}/ImageMagick*/config
-%{_libdir}/ImageMagick*/modules*/*/*.so
-%exclude %{_libdir}/ImageMagick*/modules*/*/wmf.*
-%exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
-%exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
-# don't remove la files, see bnc#579798
-%{_libdir}/ImageMagick*/modules*/*/*.la
 
 %files -n libMagickCore%{libver}
 %defattr(-,root,root)
 %doc LICENSE
+%dir %{_sysconfdir}/ImageMagick*
+%config %{_sysconfdir}/ImageMagick*/*
 %{_libdir}/libMagickCore.so.%{libver}*
+%dir %{_libdir}/ImageMagick*
+%dir %{_libdir}/ImageMagick*/modules*
+%dir %{_libdir}/ImageMagick*/modules*/*
+%{_libdir}/ImageMagick*/config
+%exclude %{_libdir}/ImageMagick*/modules*/*/wmf.*
+%exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
+%exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
+%{_libdir}/ImageMagick*/modules*/*/*.so
+# don't remove la files, see bnc#579798
+%{_libdir}/ImageMagick*/modules*/*/*.la
 
 %files -n libMagickWand%{libver}
 %defattr(-,root,root)
@@ -379,9 +258,6 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 %doc LICENSE
 %doc PerlMagick/README.txt
 %doc PerlMagick/demo
-%if %suse_version < 1140
-/var/adm/perl-modules/ImageMagick
-%endif
 %doc %{_mandir}/man3/Image::Magick.3pm*
 %{perl_vendorarch}/auto/Image
 %{perl_vendorarch}/Image
@@ -394,7 +270,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 %files -n libMagick++-devel
 %defattr(-,root,root)
 %doc LICENSE
-%doc www/Magick++/demo
+%doc Magick++/demo
 %doc Magick++/NEWS Magick++/README Magick++/AUTHORS
 %{_libdir}/libMagick++.so
 %{_includedir}/ImageMagick/Magick++.h
@@ -406,12 +282,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 
 %files doc
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
-%exclude %{_docdir}/%{name}/ChangeLog
-%exclude %{_docdir}/%{name}/LICENSE
-%exclude %{_docdir}/%{name}/NEWS.txt
-%exclude %{_docdir}/%{name}/QuickStart.txt
-%exclude %{_docdir}/%{name}/README.txt
+%dir %{_docdir}/%{name}
 
 %description
 ImageMagick is a robust collection of tools and libraries to read,
@@ -518,19 +389,6 @@ HTML documentation for ImageMagick library and scene examples.
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/wlb.tar.bz b/wlb.tar.bz
deleted file mode 100644
index 94392c8..0000000
Binary files a/wlb.tar.bz and /dev/null differ
diff --git a/xtp-5.4.3.tar.bz2 b/xtp-5.4.3.tar.bz2
deleted file mode 100644
index c58f578..0000000
--- a/xtp-5.4.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e373873fd9c20eab9116b3000361461830267f290fa5a61ebdd981785fe028cf
-size 126590