From cc77f9f0116e120136146c9d9260c0dbac14ff8ce555761d5c74c84806ecd9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 26 Apr 2011 13:18:27 +0000 Subject: [PATCH] Accepting request 68143 from home:yecril71pl:branches:graphics thanks OBS-URL: https://build.opensuse.org/request/show/68143 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=62 --- ImageMagick-6.6.8-9.tar.bz2 | 3 - ImageMagick-6.6.9-5.tar.bz2 | 3 + ImageMagick-6.6.9.1-inc-struct.diff | 1044 +++++++++++++++++++++++++++ ImageMagick.changes | 9 + ImageMagick.spec | 185 +++-- 5 files changed, 1192 insertions(+), 52 deletions(-) delete mode 100644 ImageMagick-6.6.8-9.tar.bz2 create mode 100644 ImageMagick-6.6.9-5.tar.bz2 create mode 100644 ImageMagick-6.6.9.1-inc-struct.diff diff --git a/ImageMagick-6.6.8-9.tar.bz2 b/ImageMagick-6.6.8-9.tar.bz2 deleted file mode 100644 index 34a16cd..0000000 --- a/ImageMagick-6.6.8-9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f29ce00b4ad3c850f462900c9df3c87aaed19199647bedda3db7945dd4b2b8ca -size 10089422 diff --git a/ImageMagick-6.6.9-5.tar.bz2 b/ImageMagick-6.6.9-5.tar.bz2 new file mode 100644 index 0000000..c15e605 --- /dev/null +++ b/ImageMagick-6.6.9-5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b86f7672993b1498668231885f98eda7c54565464e4fe3c07c693bbf7728be1b +size 10239024 diff --git a/ImageMagick-6.6.9.1-inc-struct.diff b/ImageMagick-6.6.9.1-inc-struct.diff new file mode 100644 index 0000000..731cf02 --- /dev/null +++ b/ImageMagick-6.6.9.1-inc-struct.diff @@ -0,0 +1,1044 @@ +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 +diff -U 3 -r -x '*.o.cmd' -- old/magick/MagickCore.h new/magick/MagickCore.h +--- old/magick/MagickCore.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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) + } +Only in old/magick: MagickCore.pc.in +Only in old/magick: Make.com +Only in old/magick: Makefile.am +Only in old/magick: PreRvIcccm.c +Only in old/magick: PreRvIcccm.h +Only in old/magick: accelerate.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/accelerate.h new/magick/accelerate.h +--- old/magick/accelerate.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/accelerate.h 2011-03-31 12:35:50.162999983 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include ++#include "morphology.h" + + extern MagickExport MagickBooleanType + AccelerateConvolveImage(const Image *,const KernelInfo *,Image *, +Only in old/magick: animate-private.h +Only in old/magick: animate.c +Only in old/magick: animate.h +Only in old/magick: annotate.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/annotate.h new/magick/annotate.h +--- old/magick/annotate.h 2011-01-24 15:14:53.000000000 +0100 ++++ new/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), +Only in old/magick: api.h +Only in old/magick: artifact.c +Only in old/magick: artifact.h +Only in old/magick: attribute.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/attribute.h new/magick/attribute.h +--- old/magick/attribute.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/attribute.h 2011-03-31 13:11:20.801999982 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "image.h" ++#include "exception.h" + + extern MagickExport ImageType + GetImageType(const Image *,ExceptionInfo *); +Only in old/magick: blob-private.h +Only in old/magick: blob.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/blob.h new/magick/blob.h +--- old/magick/blob.h 2011-02-07 01:33:21.000000000 +0100 ++++ new/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) + +Only in old/magick: cache-private.h +Only in old/magick: cache-view.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/cache-view.h new/magick/cache-view.h +--- old/magick/cache-view.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/cache-view.h 2011-03-31 13:01:34.040999983 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include "magick/pixel.h" ++#include "pixel.h" + + typedef enum + { +Only in old/magick: cache.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/cache.h new/magick/cache.h +--- old/magick/cache.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 *); +Only in old/magick: cipher.c +Only in old/magick: cipher.h +Only in old/magick: client.c +Only in old/magick: client.h +Only in old/magick: coder.c +Only in old/magick: coder.h +Only in old/magick: color-private.h +Only in old/magick: color.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/color.h new/magick/color.h +--- old/magick/color.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/color.h 2011-03-31 12:50:26.252999982 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "pixel.h" ++#include "exception.h" + + typedef enum + { +Only in old/magick: colormap-private.h +Only in old/magick: colormap.c +Only in old/magick: colormap.h +Only in old/magick: colorspace-private.h +Only in old/magick: colorspace.c +Only in old/magick: colorspace.h +Only in old/magick: compare.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/compare.h new/magick/compare.h +--- old/magick/compare.h 2010-12-11 03:17:57.000000000 +0100 ++++ new/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 + { +Only in old/magick: composite-private.h +Only in old/magick: composite.c +Only in old/magick: composite.h +Only in old/magick: compress.c +Only in old/magick: compress.h +Only in old/magick: config.h_vms +Only in old/magick: configure.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/configure.h new/magick/configure.h +--- old/magick/configure.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 + { +Only in old/magick: constitute.c +Only in old/magick: constitute.h +Only in old/magick: decorate.c +Only in old/magick: decorate.h +Only in old/magick: delegate-private.h +Only in old/magick: delegate.c +Only in old/magick: delegate.h +Only in old/magick: deprecate.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/deprecate.h new/magick/deprecate.h +--- old/magick/deprecate.h 2011-03-18 22:29:28.000000000 +0100 ++++ new/magick/deprecate.h 2011-03-31 13:20:03.271999984 +0200 +@@ -25,16 +25,16 @@ + #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) + + #include +-#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__) +Only in old/magick: display-private.h +Only in old/magick: display.c +Only in old/magick: display.h +Only in old/magick: distort.c +Only in old/magick: distort.h +Only in old/magick: draw-private.h +Only in old/magick: draw.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/draw.h new/magick/draw.h +--- old/magick/draw.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 + { +Only in old/magick: effect.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/effect.h new/magick/effect.h +--- old/magick/effect.h 2011-03-29 02:51:23.000000000 +0200 ++++ new/magick/effect.h 2011-03-31 13:03:10.296999983 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include ++#include "morphology.h" + + typedef enum + { +Only in old/magick: enhance.c +Only in old/magick: enhance.h +Only in old/magick: exception-private.h +Only in old/magick: exception.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/exception.h new/magick/exception.h +--- old/magick/exception.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/exception.h 2011-03-31 12:55:31.478999983 +0200 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include "magick/semaphore.h" ++#include "semaphore.h" + + typedef enum + { +Only in old/magick: feature.c +Only in old/magick: feature.h +Only in old/magick: fourier.c +Only in old/magick: fourier.h +Only in old/magick: fx-private.h +Only in old/magick: fx.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/fx.h new/magick/fx.h +--- old/magick/fx.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 + { +Only in old/magick: gem.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/gem.h new/magick/gem.h +--- old/magick/gem.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/gem.h 2011-03-31 13:22:57.528999984 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "fx.h" ++#include "random_.h" + + extern MagickExport double + ExpandAffine(const AffineMatrix *), +Only in old/magick: geometry.c +Only in old/magick: geometry.h +Only in old/magick: hashmap.c +Only in old/magick: hashmap.h +Only in old/magick: histogram.c +Only in old/magick: histogram.h +Only in old/magick: identify.c +Only in old/magick: identify.h +Only in old/magick: image-private.h +Only in old/magick: image-view.c +Only in old/magick: image-view.h +Only in old/magick: image.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/image.h new/magick/image.h +--- old/magick/image.h 2011-03-25 11:08:53.000000000 +0100 ++++ new/magick/image.h 2011-03-31 12:58:08.667999983 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include ++#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 + { +Only in old/magick: layer.c +Only in old/magick: layer.h +Only in old/magick: list.c +Only in old/magick: list.h +Only in old/magick: locale.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/locale_.h new/magick/locale_.h +--- old/magick/locale_.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 + { +Only in old/magick: log.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/log.h new/magick/log.h +--- old/magick/log.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/log.h 2011-03-31 13:30:00.926999982 +0200 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include "magick/exception.h" ++#include "exception.h" + + #if !defined(GetMagickModule) + # define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__ +Only in old/magick: mac.c +Only in old/magick: mac.h +Only in old/magick: magic.c +Only in old/magick: magic.h +Only in old/magick: magick-config.h +diff -U 3 -r -x '*.o.cmd' -- old/magick/magick-type.h new/magick/magick-type.h +--- old/magick/magick-type.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/magick-type.h 2011-03-31 12:28:39.428999985 +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 +Only in old/magick: magick.c +Only in old/magick: magick.h +Only in old/magick: matrix.c +Only in old/magick: matrix.h +Only in old/magick: memory.c +Only in old/magick: memory_.h +Only in old/magick: methods.h +Only in old/magick: mime-private.h +Only in old/magick: mime.c +Only in old/magick: mime.h +Only in old/magick: module.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/module.h new/magick/module.h +--- old/magick/module.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/module.h 2011-03-31 13:31:08.974999982 +0200 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include "magick/version.h" ++#include "version.h" + + #define MagickImageCoderSignature ((size_t) \ + (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH)) +Only in old/magick: monitor-private.h +Only in old/magick: monitor.c +Only in old/magick: monitor.h +Only in old/magick: montage.c +Only in old/magick: montage.h +Only in old/magick: morphology-private.h +Only in old/magick: morphology.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/morphology.h new/magick/morphology.h +--- old/magick/morphology.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/morphology.h 2011-03-31 12:38:49.826999983 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include ++#include "geometry.h" + + typedef enum + { +Only in old/magick: nt-base.c +Only in old/magick: nt-base.h +Only in old/magick: nt-feature.c +Only in old/magick: nt-feature.h +Only in old/magick: option.c +Only in old/magick: option.h +Only in old/magick: paint.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/paint.h new/magick/paint.h +--- old/magick/paint.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 *); +Only in old/magick: pixel-private.h +Only in old/magick: pixel.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/pixel.h new/magick/pixel.h +--- old/magick/pixel.h 2011-03-26 03:10:53.000000000 +0100 ++++ new/magick/pixel.h 2011-03-31 12:51:58.086999983 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "colorspace.h" ++#include "constitute.h" + + #define ClampRedPixelComponent(p) ClampToQuantum((p)->red) + #define ClampGreenPixelComponent(p) ClampToQuantum((p)->green) +Only in old/magick: policy.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/policy.h new/magick/policy.h +--- old/magick/policy.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/policy.h 2011-03-31 13:34:07.600999982 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "pixel.h" ++#include "exception.h" + + typedef enum + { +Only in old/magick: prepress.c +Only in old/magick: prepress.h +Only in old/magick: profile.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/profile.h new/magick/profile.h +--- old/magick/profile.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 + { +Only in old/magick: property.c +Only in old/magick: property.h +Only in old/magick: quantize.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/quantize.h new/magick/quantize.h +--- old/magick/quantize.h 2011-02-09 16:12:01.000000000 +0100 ++++ new/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 + { +Only in old/magick: quantum-export.c +Only in old/magick: quantum-import.c +Only in old/magick: quantum-private.h +Only in old/magick: quantum.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/quantum.h new/magick/quantum.h +--- old/magick/quantum.h 2010-08-23 15:37:35.000000000 +0200 ++++ new/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) + +Only in old/magick: random-private.h +Only in old/magick: random.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/random_.h new/magick/random_.h +--- old/magick/random_.h 2011-02-25 03:43:54.000000000 +0100 ++++ new/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. +Only in old/magick: registry.c +Only in old/magick: registry.h +Only in old/magick: resample-private.h +Only in old/magick: resample.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/resample.h new/magick/resample.h +--- old/magick/resample.h 2011-03-26 01:21:26.000000000 +0100 ++++ new/magick/resample.h 2011-03-31 13:10:02.794999984 +0200 +@@ -22,7 +22,7 @@ + extern "C" { + #endif + +-#include ++#include "cache-view.h" + + /* + WARNING: The order of this table must also match the order of a table +Only in old/magick: resize-private.h +Only in old/magick: resize.c +Only in old/magick: resize.h +Only in old/magick: resource.c +Only in old/magick: resource_.h +Only in old/magick: segment.c +Only in old/magick: segment.h +Only in old/magick: semaphore-private.h +Only in old/magick: semaphore.c +Only in old/magick: semaphore.h +Only in old/magick: shear.c +Only in old/magick: shear.h +Only in old/magick: signature-private.h +Only in old/magick: signature.c +Only in old/magick: signature.h +Only in old/magick: splay-tree.c +Only in old/magick: splay-tree.h +Only in old/magick: static.c +Only in old/magick: static.h +Only in old/magick: statistic.c +Only in old/magick: statistic.h +Only in old/magick: stream-private.h +Only in old/magick: stream.c +Only in old/magick: stream.h +Only in old/magick: string-private.h +Only in old/magick: string.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/string_.h new/magick/string_.h +--- old/magick/string_.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/string_.h 2011-03-31 13:06:47.113999983 +0200 +@@ -24,7 +24,7 @@ + + #include + #include +-#include "magick/exception.h" ++#include "exception.h" + + typedef struct _StringInfo + { +Only in old/magick: studio.h +Only in old/magick: thread-private.h +Only in old/magick: thread.c +Only in old/magick: thread_.h +Only in old/magick: threshold.c +Only in old/magick: threshold.h +Only in old/magick: timer.c +Only in old/magick: timer.h +Only in old/magick: token-private.h +Only in old/magick: token.c +Only in old/magick: token.h +Only in old/magick: transform.c +Only in old/magick: transform.h +Only in old/magick: type.c +Only in old/magick: type.h +Only in old/magick: utility.c +Only in old/magick: utility.h +Only in old/magick: version.c +Only in old/magick: version.h +Only in old/magick: version.h.in +Only in old/magick: vms.c +Only in old/magick: vms.h +Only in old/magick: widget.c +Only in old/magick: widget.h +Only in old/magick: xml-tree.c +diff -U 3 -r -x '*.o.cmd' -- old/magick/xml-tree.h new/magick/xml-tree.h +--- old/magick/xml-tree.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/magick/xml-tree.h 2011-03-31 13:35:32.189999983 +0200 +@@ -22,8 +22,8 @@ + extern "C" { + #endif + +-#include +-#include ++#include "exception.h" ++#include "splay-tree.h" + + typedef struct _XMLTreeInfo + XMLTreeInfo; +Only in old/magick: xwdfile.h_vms +Only in old/magick: xwindow-private.h +Only in old/magick: xwindow.c +Only in old/magick: xwindow.h +Only in old: magick.sh.in +Only in old: scenes +Only in old: scripts +Only in old: tests +Only in old: utilities +Only in old: version.sh +Only in old/wand: ChangeLog +Only in old/wand: MagickWand-config.1 +Only in old/wand: MagickWand-config.in +diff -U 3 -r -x '*.o.cmd' -- old/wand/MagickWand.h new/wand/MagickWand.h +--- old/wand/MagickWand.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 *); +Only in old/wand: MagickWand.pc.in +Only in old/wand: Makefile.am +Only in old/wand: Wand-config.1 +Only in old/wand: Wand-config.in +Only in old/wand: Wand.pc.in +Only in old/wand: animate.c +Only in old/wand: animate.h +Only in old/wand: common.sh +Only in old/wand: compare.c +Only in old/wand: compare.h +Only in old/wand: composite.c +Only in old/wand: composite.h +Only in old/wand: conjure.c +Only in old/wand: conjure.h +Only in old/wand: convert.c +Only in old/wand: convert.h +Only in old/wand: deprecate.c +diff -U 3 -r -x '*.o.cmd' -- old/wand/deprecate.h new/wand/deprecate.h +--- old/wand/deprecate.h 2011-03-18 22:29:28.000000000 +0100 ++++ new/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; +Only in old/wand: display.c +Only in old/wand: display.h +Only in old/wand: drawing-wand.c +diff -U 3 -r -x '*.o.cmd' -- old/wand/drawing-wand.h new/wand/drawing-wand.h +--- old/wand/drawing-wand.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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; +Only in old/wand: drawtest.c +Only in old/wand: drawtest.sh +Only in old/wand: identify.c +Only in old/wand: identify.h +Only in old/wand: import.c +Only in old/wand: import.h +Only in old/wand: input_256c.miff +Only in old/wand: input_bilevel.miff +Only in old/wand: input_gray.miff +Only in old/wand: input_truecolor.miff +Only in old/wand: magick-image.c +Only in old/wand: magick-image.h +Only in old/wand: magick-property.c +Only in old/wand: magick-property.h +Only in old/wand: magick-wand-private.h +Only in old/wand: magick-wand.c +diff -U 3 -r -x '*.o.cmd' -- old/wand/magick-wand.h new/wand/magick-wand.h +--- old/wand/magick-wand.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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 +Only in old/wand: magick_wand.h +Only in old/wand: mogrify-private.h +Only in old/wand: mogrify.c +Only in old/wand: mogrify.h +Only in old/wand: montage.c +Only in old/wand: montage.h +Only in old/wand: pixel-iterator.c +diff -U 3 -r -x '*.o.cmd' -- old/wand/pixel-iterator.h new/wand/pixel-iterator.h +--- old/wand/pixel-iterator.h 2010-12-05 00:12:08.000000000 +0100 ++++ new/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; +Only in old/wand: pixel-wand-private.h +Only in old/wand: pixel-wand.c +Only in old/wand: pixel-wand.h +Only in old/wand: sequence.miff +Only in old/wand: stream.c +Only in old/wand: stream.h +Only in old/wand: studio.h +Only in old/wand: wand-view.c +Only in old/wand: wand-view.h +Only in old/wand: wand.c +Only in old/wand: wand.h +Only in old/wand: wandtest.c +Only in old/wand: wandtest.sh +Only in old: wand.h +Only in old: winpath.sh +Only in old: www diff --git a/ImageMagick.changes b/ImageMagick.changes index 4c65f5a..5a68457 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 21 10:00:25 UTC 2011 - giecrilj@stegny.2a.pl + +- updated to 6.6.9.5: fixes [Bug 682238] + * macroized and cleaned up scripts + * added conditions for optional components + * updated file lists for upstream + * cleaned up the include tree in devel (patch) + ------------------------------------------------------------------- Mon Apr 11 15:28:24 CEST 2011 - pgajdos@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index d51cd2a..eae508a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -17,33 +17,92 @@ # norootforbuild +%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 Name: ImageMagick -BuildRequires: dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std -BuildRequires: ghostscript-library liblcms-devel libtiff-devel libwmf-devel -BuildRequires: libxml2-devel pkgconfig -BuildRequires: fdupes libdjvulibre-devel libexif-devel libjasper-devel -Obsoletes: imagemag -Provides: imagemag + +BuildRequires: pkgconfig fdupes + +%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 ghostscript-fonts-std ghostscript-library +%endif + +%if %{with LCMS} +BuildRequires: liblcms-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 + %define xtp_version 5.4.3 +%define mfr_version 6.6.9 +%define mfr_revision 5 +%define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.8.9 +Version: %{mfr_version}.%{mfr_revision} Release: 1 -%define source_version 6.6.8-9 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org -Source: ImageMagick-%{source_version}.tar.bz2 +Source: ImageMagick-6.6.9-5.tar.bz2 # To get mtime of file Source1: ImageMagick.changes +%if %{with xtp} Source2: xtp-%{xtp_version}.tar.bz2 +%endif Source3: baselibs.conf -Patch1: ImageMagick-%{version}-examples.patch -Patch2: ImageMagick-%{version}-doc.patch +Patch1: ImageMagick-6.6.8.9-examples.patch +Patch2: ImageMagick-6.6.8.9-doc.patch +Patch3: ImageMagick-6.6.9.1-inc-struct.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Provides: imagemag = %{version} +Obsoletes: imagemag < %{version} %package -n perl-PerlMagick License: Public Domain, Freeware Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} @@ -88,39 +147,48 @@ AutoReqProv: on License: PERMISSIVE-OSI-COMPLIANT -Requires: ImageMagick = %{version} +Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ AutoReqProv: on # was last used in openSUSE 10.2 -Provides: ImageMagick-Magick++ = 6.3.3 -Obsoletes: ImageMagick-Magick++ <= 6.3.3 +Provides: ImageMagick-Magick++ = %{version} +Obsoletes: ImageMagick-Magick++ < %{version} %package -n libMagick++-devel License: PERMISSIVE-OSI-COMPLIANT Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ -Provides: ImageMagick-Magick++-devel -Obsoletes: ImageMagick-Magick++-devel <= %{version} +Provides: ImageMagick-Magick++-devel = %{version} +Obsoletes: ImageMagick-Magick++-devel < %{version} AutoReqProv: on %package doc License: PERMISSIVE-OSI-COMPLIANT Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ -Requires: ImageMagick = %{version} %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %prep rm -rf xtp-%{xtp_version} +%if %{with xtp} %setup -n ImageMagick-%{source_version} -b 2 +%else +%setup -n ImageMagick-%{source_version} +%endif %patch1 %patch2 +%patch3 -p1 +echo>header-test.c '#include "wand.h"' +echo>wand.h '#include "wand/MagickWand.h"' +%{__make} header-test.o %build +%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all +%define LDFLAGS -L%{_libdir} -fuse-linker-plugin %define system_ltdl 0 %if %system_ltdl cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl @@ -132,37 +200,36 @@ CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` 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 -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" -export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" -%if %suse_version <= 1030 +%endif + +%if %{suse_version} <= 1030 # openmp does not work with perl module OPENMP="--disable-openmp" %endif -export LDFLAGS="-L%{_libdir}" %configure \ --enable-shared \ --without-frozenpaths \ - --with-largefiles \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --without-perl \ --disable-static \ - --enable-libtool-verbose \ - --with-djvu=yes $OPENMP + --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" make %{?jobs:-j%jobs} all cd PerlMagick perl Makefile.PL make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" # +%if %{with xtp} cd ../../xtp-%{xtp_version} -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -export CXXFLAGS="$RPM_OPT_FLAGS" -%configure +%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}" make %{?jobs:-j%jobs} +%endif %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs @@ -173,35 +240,39 @@ cd PerlMagick make test %install -install -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/images -make install \ +%{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images' +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ pkgdocdir=%{_defaultdocdir}/%{name}/ -install -m 644 ChangeLog QuickStart.txt README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ cd PerlMagick -make 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} `find demo -type f -perm +111` - mv demo/makefile.2 demo/Makefile +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 DESTDIR=$RPM_BUILD_ROOT install - install -m 644 README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README-xtp.txt + %{__make} DESTDIR=$RPM_BUILD_ROOT install popd -mv $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/ImageMagick* -mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ -cp -a scenes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ -find $RPM_BUILD_ROOT/%{_libdir} -name "*.la" -print0 | xargs -0 -r perl -spi -e "s@ -L/usr/src[^ ]*@@g;s@ /usr/lib/libltdl.la@@g" -rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%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 \ + -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' +%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* +%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la +echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand -%fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api +%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand +%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api %endif %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %post -n libMagickCore%{libver} -p /sbin/ldconfig @@ -218,14 +289,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %docdir %{_docdir}/%{name} -%{_docdir}/%{name}/*.txt -%{_docdir}/%{name}/ChangeLog -%{_docdir}/%{name}/LICENSE +%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE +%define mfr_docdir %{_defaultdocdir}/../%{name}-%{mfr_version}/packages/%{name}/ +%exclude %{mfr_docdir}ChangeLog +%exclude %{mfr_docdir}LICENSE +%exclude %{mfr_docdir}NEWS.txt %{_bindir}/[^MW]* %doc %{_mandir}/man1/* +%exclude %{_mandir}/man1/*-config.1.gz %files -n libMagickCore%{libver} %defattr(-,root,root) +%doc LICENSE %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore.so.%{libver}* @@ -241,10 +316,12 @@ rm -rf $RPM_BUILD_ROOT %files -n libMagickWand%{libver} %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagickWand.so.%{libver}* %files extra %defattr(-,root,root) +%doc LICENSE %{_libdir}/ImageMagick*/modules*/*/wmf.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/wmf.la @@ -255,11 +332,13 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagickCore.so %{_libdir}/libMagickWand.so %dir %{_includedir}/ImageMagick %{_includedir}/ImageMagick/magick %{_includedir}/ImageMagick/wand +%{_includedir}/ImageMagick/wand.h %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config %{_bindir}/Magick-config @@ -268,9 +347,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/Wand.pc %{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/MagickWand.pc +%doc %{_mandir}/man1/*-config.1.gz +%exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root) +%doc LICENSE %doc PerlMagick/README.txt %doc PerlMagick/demo %if %suse_version < 1140 @@ -282,10 +364,12 @@ rm -rf $RPM_BUILD_ROOT %files -n libMagick++%{libver} %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagick++.so.%{libver}* %files -n libMagick++-devel %defattr(-,root,root) +%doc LICENSE %doc Magick++/demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++.so @@ -294,14 +378,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/Magick++-config %{_libdir}/pkgconfig/ImageMagick++.pc %{_libdir}/pkgconfig/Magick++.pc +%doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) %dir %{_docdir}/%{name} +%if 0 %{_docdir}/%{name}/index.html %{_docdir}/%{name}/www %{_docdir}/%{name}/images %{_docdir}/%{name}/scenes +%endif %description ImageMagick is a robust collection of tools and libraries to read,