From 4a735f79db393cfd873ae28d1a03382dc448af1cdd2879510607e7bffc302cc8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jun 2011 10:36:16 +0000 Subject: [PATCH 01/10] Updating link to change in openSUSE:Factory/ImageMagick revision 69.0 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=6848dd64edabcb66dee07f090d49231c --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 010da94..de2c287 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -86,7 +86,7 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on Version: %{mfr_version}.%{mfr_revision} -Release: 6 +Release: 1 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org From 4dbbfeb4d0bba68a390cee1a4f3c503424f957564f03d621d2006475e2a91053 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 28 Jul 2011 17:09:19 +0000 Subject: [PATCH 02/10] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=77 --- ImageMagick-6.6.9.1-inc-struct.diff | 226 ++++++++++++++-------------- ImageMagick-6.7.0-8.tar.bz2 | 3 - ImageMagick-6.7.1-0.tar.bz2 | 3 + ImageMagick.spec | 4 +- 4 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 ImageMagick-6.7.0-8.tar.bz2 create mode 100644 ImageMagick-6.7.1-0.tar.bz2 diff --git a/ImageMagick-6.6.9.1-inc-struct.diff b/ImageMagick-6.6.9.1-inc-struct.diff index 44cb642..6cc567a 100644 --- a/ImageMagick-6.6.9.1-inc-struct.diff +++ b/ImageMagick-6.6.9.1-inc-struct.diff @@ -34,10 +34,10 @@ 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.0-8/magick/MagickCore.h +Index: ImageMagick-6.7.1-0/magick/MagickCore.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/MagickCore.h -+++ ImageMagick-6.7.0-8/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 @@ -218,10 +218,10 @@ Index: ImageMagick-6.7.0-8/magick/MagickCore.h #if defined(__cplusplus) || defined(c_plusplus) } -Index: ImageMagick-6.7.0-8/magick/accelerate.h +Index: ImageMagick-6.7.1-0/magick/accelerate.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/accelerate.h -+++ ImageMagick-6.7.0-8/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 @@ -231,10 +231,10 @@ Index: ImageMagick-6.7.0-8/magick/accelerate.h extern MagickExport MagickBooleanType AccelerateConvolveImage(const Image *,const KernelInfo *,Image *, -Index: ImageMagick-6.7.0-8/magick/annotate.h +Index: ImageMagick-6.7.1-0/magick/annotate.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/annotate.h -+++ ImageMagick-6.7.0-8/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 @@ -244,10 +244,10 @@ Index: ImageMagick-6.7.0-8/magick/annotate.h extern MagickExport MagickBooleanType AnnotateComponentGenesis(void), -Index: ImageMagick-6.7.0-8/magick/attribute.h +Index: ImageMagick-6.7.1-0/magick/attribute.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/attribute.h -+++ ImageMagick-6.7.0-8/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 @@ -259,10 +259,10 @@ Index: ImageMagick-6.7.0-8/magick/attribute.h extern MagickExport ImageType GetImageType(const Image *,ExceptionInfo *); -Index: ImageMagick-6.7.0-8/magick/blob.h +Index: ImageMagick-6.7.1-0/magick/blob.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/blob.h -+++ ImageMagick-6.7.0-8/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 @@ -274,10 +274,10 @@ Index: ImageMagick-6.7.0-8/magick/blob.h #define MagickMaxBufferExtent (32*8192) -Index: ImageMagick-6.7.0-8/magick/cache-view.h +Index: ImageMagick-6.7.1-0/magick/cache-view.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/cache-view.h -+++ ImageMagick-6.7.0-8/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 @@ -287,10 +287,10 @@ Index: ImageMagick-6.7.0-8/magick/cache-view.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/cache.h +Index: ImageMagick-6.7.1-0/magick/cache.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/cache.h -+++ ImageMagick-6.7.0-8/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 @@ -300,10 +300,10 @@ Index: ImageMagick-6.7.0-8/magick/cache.h extern MagickExport const IndexPacket *GetVirtualIndexQueue(const Image *); -Index: ImageMagick-6.7.0-8/magick/color.h +Index: ImageMagick-6.7.1-0/magick/color.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/color.h -+++ ImageMagick-6.7.0-8/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 @@ -315,10 +315,10 @@ Index: ImageMagick-6.7.0-8/magick/color.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/compare.h +Index: ImageMagick-6.7.1-0/magick/compare.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/compare.h -+++ ImageMagick-6.7.0-8/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 @@ -328,10 +328,10 @@ Index: ImageMagick-6.7.0-8/magick/compare.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/configure.h +Index: ImageMagick-6.7.1-0/magick/configure.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/configure.h -+++ ImageMagick-6.7.0-8/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 @@ -341,10 +341,10 @@ Index: ImageMagick-6.7.0-8/magick/configure.h typedef struct _ConfigureInfo { -Index: ImageMagick-6.7.0-8/magick/deprecate.h +Index: ImageMagick-6.7.1-0/magick/deprecate.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/deprecate.h -+++ ImageMagick-6.7.0-8/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) @@ -372,10 +372,10 @@ Index: ImageMagick-6.7.0-8/magick/deprecate.h #if !defined(magick_attribute) # if !defined(__GNUC__) -Index: ImageMagick-6.7.0-8/magick/draw.h +Index: ImageMagick-6.7.1-0/magick/draw.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/draw.h -+++ ImageMagick-6.7.0-8/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 @@ -391,10 +391,10 @@ Index: ImageMagick-6.7.0-8/magick/draw.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/effect.h +Index: ImageMagick-6.7.1-0/magick/effect.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/effect.h -+++ ImageMagick-6.7.0-8/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 @@ -404,10 +404,10 @@ Index: ImageMagick-6.7.0-8/magick/effect.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/exception.h +Index: ImageMagick-6.7.1-0/magick/exception.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/exception.h -+++ ImageMagick-6.7.0-8/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 @@ -417,10 +417,10 @@ Index: ImageMagick-6.7.0-8/magick/exception.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/fx.h +Index: ImageMagick-6.7.1-0/magick/fx.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/fx.h -+++ ImageMagick-6.7.0-8/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 @@ -430,10 +430,10 @@ Index: ImageMagick-6.7.0-8/magick/fx.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/gem.h +Index: ImageMagick-6.7.1-0/magick/gem.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/gem.h -+++ ImageMagick-6.7.0-8/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 @@ -445,10 +445,10 @@ Index: ImageMagick-6.7.0-8/magick/gem.h extern MagickExport double ExpandAffine(const AffineMatrix *), -Index: ImageMagick-6.7.0-8/magick/image.h +Index: ImageMagick-6.7.1-0/magick/image.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/image.h -+++ ImageMagick-6.7.0-8/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 @@ -503,10 +503,10 @@ Index: ImageMagick-6.7.0-8/magick/image.h struct _Image { -Index: ImageMagick-6.7.0-8/magick/locale_.h +Index: ImageMagick-6.7.1-0/magick/locale_.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/locale_.h -+++ ImageMagick-6.7.0-8/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 @@ -516,10 +516,10 @@ Index: ImageMagick-6.7.0-8/magick/locale_.h typedef struct _LocaleInfo { -Index: ImageMagick-6.7.0-8/magick/log.h +Index: ImageMagick-6.7.1-0/magick/log.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/log.h -+++ ImageMagick-6.7.0-8/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 @@ -529,10 +529,10 @@ Index: ImageMagick-6.7.0-8/magick/log.h #if !defined(GetMagickModule) # define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__ -Index: ImageMagick-6.7.0-8/magick/magick-type.h +Index: ImageMagick-6.7.1-0/magick/magick-type.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/magick-type.h -+++ ImageMagick-6.7.0-8/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 @@ -542,10 +542,10 @@ Index: ImageMagick-6.7.0-8/magick/magick-type.h #if !defined(MAGICKCORE_QUANTUM_DEPTH) #define MAGICKCORE_QUANTUM_DEPTH 16 -Index: ImageMagick-6.7.0-8/magick/module.h +Index: ImageMagick-6.7.1-0/magick/module.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/module.h -+++ ImageMagick-6.7.0-8/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 @@ -555,10 +555,10 @@ Index: ImageMagick-6.7.0-8/magick/module.h #define MagickImageCoderSignature ((size_t) \ (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH)) -Index: ImageMagick-6.7.0-8/magick/morphology.h +Index: ImageMagick-6.7.1-0/magick/morphology.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/morphology.h -+++ ImageMagick-6.7.0-8/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 @@ -568,10 +568,10 @@ Index: ImageMagick-6.7.0-8/magick/morphology.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/paint.h +Index: ImageMagick-6.7.1-0/magick/paint.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/paint.h -+++ ImageMagick-6.7.0-8/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 @@ -583,10 +583,10 @@ Index: ImageMagick-6.7.0-8/magick/paint.h extern MagickExport Image *OilPaintImage(const Image *,const double,ExceptionInfo *); -Index: ImageMagick-6.7.0-8/magick/pixel.h +Index: ImageMagick-6.7.1-0/magick/pixel.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/pixel.h -+++ ImageMagick-6.7.0-8/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 @@ -596,12 +596,12 @@ Index: ImageMagick-6.7.0-8/magick/pixel.h +#include "colorspace.h" +#include "constitute.h" - #define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red) - #define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green) -Index: ImageMagick-6.7.0-8/magick/policy.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.0-8.orig/magick/policy.h -+++ ImageMagick-6.7.0-8/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 @@ -613,10 +613,10 @@ Index: ImageMagick-6.7.0-8/magick/policy.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/profile.h +Index: ImageMagick-6.7.1-0/magick/profile.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/profile.h -+++ ImageMagick-6.7.0-8/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 @@ -626,10 +626,10 @@ Index: ImageMagick-6.7.0-8/magick/profile.h typedef struct _ProfileInfo { -Index: ImageMagick-6.7.0-8/magick/quantize.h +Index: ImageMagick-6.7.1-0/magick/quantize.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/quantize.h -+++ ImageMagick-6.7.0-8/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 @@ -639,10 +639,10 @@ Index: ImageMagick-6.7.0-8/magick/quantize.h typedef enum { -Index: ImageMagick-6.7.0-8/magick/quantum.h +Index: ImageMagick-6.7.1-0/magick/quantum.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/quantum.h -+++ ImageMagick-6.7.0-8/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 @@ -652,10 +652,10 @@ Index: ImageMagick-6.7.0-8/magick/quantum.h #define RoundToQuantum(quantum) ClampToQuantum(quantum) -Index: ImageMagick-6.7.0-8/magick/random_.h +Index: ImageMagick-6.7.1-0/magick/random_.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/random_.h -+++ ImageMagick-6.7.0-8/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 @@ -665,10 +665,10 @@ Index: ImageMagick-6.7.0-8/magick/random_.h /* Typedef declarations. -Index: ImageMagick-6.7.0-8/magick/resample.h +Index: ImageMagick-6.7.1-0/magick/resample.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/resample.h -+++ ImageMagick-6.7.0-8/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 @@ -678,10 +678,10 @@ Index: ImageMagick-6.7.0-8/magick/resample.h /* WARNING: The order of this table must also match the order of a table -Index: ImageMagick-6.7.0-8/magick/string_.h +Index: ImageMagick-6.7.1-0/magick/string_.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/string_.h -+++ ImageMagick-6.7.0-8/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 @@ -691,10 +691,10 @@ Index: ImageMagick-6.7.0-8/magick/string_.h typedef struct _StringInfo { -Index: ImageMagick-6.7.0-8/magick/xml-tree.h +Index: ImageMagick-6.7.1-0/magick/xml-tree.h =================================================================== ---- ImageMagick-6.7.0-8.orig/magick/xml-tree.h -+++ ImageMagick-6.7.0-8/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 @@ -706,10 +706,10 @@ Index: ImageMagick-6.7.0-8/magick/xml-tree.h typedef struct _XMLTreeInfo XMLTreeInfo; -Index: ImageMagick-6.7.0-8/wand/MagickWand.h +Index: ImageMagick-6.7.1-0/wand/MagickWand.h =================================================================== ---- ImageMagick-6.7.0-8.orig/wand/MagickWand.h -+++ ImageMagick-6.7.0-8/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 @@ -764,10 +764,10 @@ Index: ImageMagick-6.7.0-8/wand/MagickWand.h extern WandExport char *MagickGetException(const MagickWand *,ExceptionType *); -Index: ImageMagick-6.7.0-8/wand/deprecate.h +Index: ImageMagick-6.7.1-0/wand/deprecate.h =================================================================== ---- ImageMagick-6.7.0-8.orig/wand/deprecate.h -+++ ImageMagick-6.7.0-8/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) @@ -783,10 +783,10 @@ Index: ImageMagick-6.7.0-8/wand/deprecate.h typedef struct _DrawingWand *DrawContext; -Index: ImageMagick-6.7.0-8/wand/drawing-wand.h +Index: ImageMagick-6.7.1-0/wand/drawing-wand.h =================================================================== ---- ImageMagick-6.7.0-8.orig/wand/drawing-wand.h -+++ ImageMagick-6.7.0-8/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 @@ -796,10 +796,10 @@ Index: ImageMagick-6.7.0-8/wand/drawing-wand.h typedef struct _DrawingWand DrawingWand; -Index: ImageMagick-6.7.0-8/wand/magick-wand.h +Index: ImageMagick-6.7.1-0/wand/magick-wand.h =================================================================== ---- ImageMagick-6.7.0-8.orig/wand/magick-wand.h -+++ ImageMagick-6.7.0-8/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 @@ -808,10 +808,10 @@ Index: ImageMagick-6.7.0-8/wand/magick-wand.h +#include "MagickWand.h" #endif -Index: ImageMagick-6.7.0-8/wand/pixel-iterator.h +Index: ImageMagick-6.7.1-0/wand/pixel-iterator.h =================================================================== ---- ImageMagick-6.7.0-8.orig/wand/pixel-iterator.h -+++ ImageMagick-6.7.0-8/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 diff --git a/ImageMagick-6.7.0-8.tar.bz2 b/ImageMagick-6.7.0-8.tar.bz2 deleted file mode 100644 index 79ca9cf..0000000 --- a/ImageMagick-6.7.0-8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a3b4f556c0f44b5d0be04935531e36e2fc06a641ba2e92e0b6d8ee2d75a05c5 -size 10231533 diff --git a/ImageMagick-6.7.1-0.tar.bz2 b/ImageMagick-6.7.1-0.tar.bz2 new file mode 100644 index 0000000..fbe22c8 --- /dev/null +++ b/ImageMagick-6.7.1-0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8092d0cabc32470b3635931d7a2dfa0fb94ac2b1e2757db84c748b88103d745 +size 10204971 diff --git a/ImageMagick.spec b/ImageMagick.spec index de2c287..0fc621c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -79,8 +79,8 @@ BuildRequires: libjasper-devel %endif %define xtp_version 5.4.3 -%define mfr_version 6.7.0 -%define mfr_revision 8 +%define mfr_version 6.7.1 +%define mfr_revision 0 %define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other From 3bbad439b5ae18d47718bff4f16f9405f2e037023ffd8ed5f620025189f56bcc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 29 Jul 2011 07:09:15 +0000 Subject: [PATCH 03/10] - update to 6.7.1.0: * Defend against corrupt PSD resource blocks. * Properly allocate points when render text with large font size. * Added support for Z_RLE strategy in the png compressor, using -quality 98 or 99. * Handle "-quality 97" properly in the png encoder, i.e., use intrapixel filtering when writing a MNG file and no filtering when writing a PNG file. * Added "-define PNG:compression-level|strategy|filter=value" options to the PNG encoder. If these options are used, they take precedence over the -quality option. * Use zlib default compression strategy instead of Z_RLE and Z_FIXED strategies when linking with zlib versions (prior to 1.2.0 and 1.2.2.2, respectively) that don't support them. OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=78 --- ImageMagick.changes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index b81ef19..dbbbc84 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Jul 29 07:07:44 UTC 2011 - pgajdos@novell.com + +- update to 6.7.1.0: + * Defend against corrupt PSD resource blocks. + * Properly allocate points when render text with large font size. + * Added support for Z_RLE strategy in the png compressor, using + -quality 98 or 99. + * Handle "-quality 97" properly in the png encoder, i.e., use intrapixel + filtering when writing a MNG file and no filtering when writing a PNG file. + * Added "-define PNG:compression-level|strategy|filter=value" options to + the PNG encoder. If these options are used, they take precedence over + the -quality option. + * Use zlib default compression strategy instead of Z_RLE and Z_FIXED + strategies when linking with zlib versions (prior to 1.2.0 and 1.2.2.2, + respectively) that don't support them. + ------------------------------------------------------------------- Mon Jun 20 10:44:54 UTC 2011 - pgajdos@novell.com From 824d6d9117255b30763d11c97926642fa9fdd98d43b5f64a6a14858cb2c8fdc3 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 29 Jul 2011 08:25:27 +0000 Subject: [PATCH 04/10] - switch on WEBP support -- require libwebp-devel to build OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=79 --- ImageMagick.changes | 1 + ImageMagick.spec | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index dbbbc84..2e78ee7 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -14,6 +14,7 @@ Fri Jul 29 07:07:44 UTC 2011 - pgajdos@novell.com * Use zlib default compression strategy instead of Z_RLE and Z_FIXED strategies when linking with zlib versions (prior to 1.2.0 and 1.2.2.2, respectively) that don't support them. +- switch on WEBP support -- require libwebp-devel to build ------------------------------------------------------------------- Mon Jun 20 10:44:54 UTC 2011 - pgajdos@novell.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0fc621c..3ee9023 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -29,10 +29,11 @@ %bcond_without DejaVu %bcond_without EXIF %bcond_without JPEG +%bcond_without WEBP Name: ImageMagick -BuildRequires: fdupes pkgconfig +BuildRequires: fdupes pkgconfig %if %{with DCraw} BuildRequires: dcraw @@ -78,6 +79,10 @@ BuildRequires: libexif-devel BuildRequires: libjasper-devel %endif +%if %{with WEBP} +BuildRequires: libwebp-devel +%endif + %define xtp_version 5.4.3 %define mfr_version 6.7.1 %define mfr_revision 0 @@ -139,6 +144,9 @@ Requires: libexif-devel %if %{with JPEG} Requires: libjasper-devel %endif +%if %{with WEBP} +Requires: libwebp-devel +%endif %package extra License: PERMISSIVE-OSI-COMPLIANT From 9cfd98e9ba2258b2ec50c29b3bfd666b2b7e1c8146724e328c556ac09163dc7c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 7 Sep 2011 08:54:16 +0000 Subject: [PATCH 05/10] - fixed wrong error messages [bnc#673303] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=80 --- ...eMagick-6.7.1-0-reason-error-message.patch | 15 + ImageMagick.changes | 5 + ImageMagick.spec | 10 +- _service:format_spec_file:ImageMagick.spec | 570 ++++++++++++++++++ 4 files changed, 595 insertions(+), 5 deletions(-) create mode 100644 ImageMagick-6.7.1-0-reason-error-message.patch create mode 100644 _service:format_spec_file:ImageMagick.spec diff --git a/ImageMagick-6.7.1-0-reason-error-message.patch b/ImageMagick-6.7.1-0-reason-error-message.patch new file mode 100644 index 0000000..efd2c03 --- /dev/null +++ b/ImageMagick-6.7.1-0-reason-error-message.patch @@ -0,0 +1,15 @@ +--- magick/exception.c 2011-09-06 15:31:15.000000000 +0200 ++++ magick/exception.c 2011-09-06 17:11:20.000000000 +0200 +@@ -458,7 +458,11 @@ MagickExport char *GetExceptionMessage(c + exception[MaxTextExtent]; + + #if defined(MAGICKCORE_HAVE_STRERROR_R) +- (void) strerror_r(error,exception,sizeof(exception)); ++ #if !defined(_GNU_SOURCE) ++ (void) strerror_r(error,exception,sizeof(exception)); ++ #else ++ (void) CopyMagickString(exception,strerror_r(error, exception, sizeof(exception)),sizeof(exception)); ++ #endif + #else + (void) CopyMagickString(exception,strerror(error),sizeof(exception)); + #endif diff --git a/ImageMagick.changes b/ImageMagick.changes index 2e78ee7..e56c99d 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com + +- fixed wrong error messages [bnc#673303] + ------------------------------------------------------------------- Fri Jul 29 07:07:44 UTC 2011 - pgajdos@novell.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 3ee9023..a882a35 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -33,7 +33,7 @@ Name: ImageMagick -BuildRequires: fdupes pkgconfig +BuildRequires: fdupes pkgconfig %if %{with DCraw} BuildRequires: dcraw @@ -108,6 +108,7 @@ Patch2: ImageMagick-6.6.8.9-doc.patch # see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include # for upstream progress Patch3: ImageMagick-6.6.9.1-inc-struct.diff +Patch4: ImageMagick-6.7.1-0-reason-error-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: imagemag = %{version} Obsoletes: imagemag < %{version} @@ -145,7 +146,7 @@ Requires: libexif-devel Requires: libjasper-devel %endif %if %{with WEBP} -Requires: libwebp-devel +Requires: libwebp-devel %endif %package extra @@ -159,7 +160,6 @@ AutoReqProv: on %package -n libMagickCore%{libver} - License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other @@ -168,7 +168,6 @@ AutoReqProv: on %package -n libMagickWand%{libver} - License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other @@ -176,7 +175,6 @@ AutoReqProv: on %package -n libMagick++%{libver} - License: PERMISSIVE-OSI-COMPLIANT Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library @@ -213,6 +211,7 @@ rm -rf xtp-%{xtp_version} %patch1 %patch2 %patch3 -p1 +%patch4 # remove together with inc-struct.diff ---- echo>header-test.c '#include "wand.h"' # echo>wand.h '#include "wand/MagickWand.h"' # @@ -566,4 +565,5 @@ Authors: %description doc HTML documentation for ImageMagick library and scene examples. + %changelog diff --git a/_service:format_spec_file:ImageMagick.spec b/_service:format_spec_file:ImageMagick.spec new file mode 100644 index 0000000..d72a24d --- /dev/null +++ b/_service:format_spec_file:ImageMagick.spec @@ -0,0 +1,570 @@ +# +# spec file for package ImageMagick +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# 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 +%bcond_without WEBP + +Name: ImageMagick + +BuildRequires: fdupes 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 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 + +%if %{with WEBP} +BuildRequires: libwebp-devel +%endif + +%define xtp_version 5.4.3 +%define mfr_version 6.7.1 +%define mfr_revision 0 +%define source_version %{mfr_version}-%{mfr_revision} +License: Public Domain, Freeware +Group: Productivity/Graphics/Other +AutoReqProv: on +Version: %{mfr_version}.%{mfr_revision} +Release: 1 +%define libver 4 +Summary: Viewer and Converter for Images +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 +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 +Patch4: ImageMagick-6.7.1-0-reason-error-message.patch +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} +Summary: Perl interface for ImageMagick +Group: Development/Libraries/Perl +AutoReqProv: on + +%package devel +License: PERMISSIVE-OSI-COMPLIANT +Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{version} +Requires: ImageMagick = %{version} +Summary: Include Files and Libraries Mandatory for Development +Group: Development/Libraries/C and C++ +AutoReqProv: on +%if %{with FreeType} +Requires: freetype2-devel +%endif +%if %{with LCMS} +Requires: liblcms-devel +%endif +%if %{with TIFF} +Requires: libtiff-devel +%endif +%if %{with WMF} +Requires: libwmf-devel +%endif +%if %{with EXIF} +Requires: libexif-devel +%endif +%if %{with JPEG} +Requires: libjasper-devel +%endif +%if %{with WEBP} +Requires: libwebp-devel +%endif + +%package extra +License: PERMISSIVE-OSI-COMPLIANT +Requires: ImageMagick = %{version} libMagickCore%{libver} = %{version} +Summary: Viewer and Converter for Images - extra codecs +Group: Productivity/Graphics/Other +#delegates configured in delegates.xml that imagemagick can use +Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf +AutoReqProv: on + +%package -n libMagickCore%{libver} + +License: PERMISSIVE-OSI-COMPLIANT +Summary: Viewer and Converter for Images - runtime library +Group: Productivity/Graphics/Other +Suggests: ImageMagick-extra = %{version} +AutoReqProv: on + +%package -n libMagickWand%{libver} + +License: PERMISSIVE-OSI-COMPLIANT +Summary: Viewer and Converter for Images - runtime library +Group: Productivity/Graphics/Other +AutoReqProv: on + +%package -n libMagick++%{libver} + +License: PERMISSIVE-OSI-COMPLIANT +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++ = %{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 = %{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++ +%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 +%patch4 +# remove together with inc-struct.diff ---- +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} +%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:::" ltdl/ltdl.c.orig >ltdl/ltdl.c +%endif +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 \ + --enable-shared \ + --without-frozenpaths \ + --with-magick_plus_plus \ + --with-modules \ + --with-threads \ + --without-perl \ + --disable-static \ + --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} +%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 +export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs +export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs +export MAGICK_CONFIGURE_PATH=$PWD/config +cd PerlMagick +make test + +%install +%{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images' +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + pkgdocdir=%{_defaultdocdir}/%{name}/ +cd PerlMagick +%{__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} 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 \ + -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}/%{name}/wand +%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api +%endif + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%post -n libMagickCore%{libver} -p /sbin/ldconfig + +%postun -n libMagickCore%{libver} -p /sbin/ldconfig + +%post -n libMagickWand%{libver} -p /sbin/ldconfig + +%postun -n libMagickWand%{libver} -p /sbin/ldconfig + +%post -n libMagick++%{libver} -p /sbin/ldconfig + +%postun -n libMagick++%{libver} -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%docdir %{_docdir}/%{name} +%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}* +%dir %{_libdir}/ImageMagick* +%dir %{_libdir}/ImageMagick*/modules* +%dir %{_libdir}/ImageMagick*/modules*/* +%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) +%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 +%{_libdir}/ImageMagick*/modules*/*/jp2.so +%{_libdir}/ImageMagick*/modules*/*/jp2.la +%{_libdir}/ImageMagick*/modules*/*/djvu.so +%{_libdir}/ImageMagick*/modules*/*/djvu.la + +%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 +%{_bindir}/Wand-config +%{_libdir}/pkgconfig/ImageMagick.pc +%{_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 +/var/adm/perl-modules/ImageMagick +%endif +%doc %{_mandir}/man3/Image::Magick.3pm* +%{perl_vendorarch}/auto/Image +%{perl_vendorarch}/Image + +%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 +%{_includedir}/ImageMagick/Magick++.h +%{_includedir}/ImageMagick/Magick++ +%{_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, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + + + +Authors: +-------- + John Cristy + +%description devel +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + + + +Authors: +-------- + John Cristy + +%description extra +This package adds support for djvu, wmf and jpeg2000 formats and +installs optional helper applications. + +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + + + +Authors: +-------- + John Cristy + +%description -n libMagickCore%{libver} +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + + + +Authors: +-------- + John Cristy + +%description -n libMagickWand%{libver} +ImageMagick is a robust collection of tools and libraries to read, +write, and manipulate an image in many image formats, including popular +formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + + + +Authors: +-------- + John Cristy + +%description -n perl-PerlMagick +PerlMagick is an objected-oriented Perl interface to ImageMagick. Use +the module to read, manipulate, or write an image or image sequence +from within a Perl script. This makes it suitable for Web CGI scripts. + + + +Authors: +-------- + John Cristy + +%description -n libMagick++%{libver} +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + + + +Authors: +-------- + Bob Friesenhahn + +%description -n libMagick++-devel +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + + + +Authors: +-------- + Bob Friesenhahn + +%description doc +HTML documentation for ImageMagick library and scene examples. + + + +%changelog From d60e6c4b46c14151c509e15e931ee4d2cb9c2a57d7987ba4861a368e245e75e6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 7 Sep 2011 09:10:56 +0000 Subject: [PATCH 06/10] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=81 --- ImageMagick-6.7.1-0-reason-error-message.patch | 10 ++++++---- ImageMagick.spec | 1 + _service:format_spec_file:ImageMagick.spec | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ImageMagick-6.7.1-0-reason-error-message.patch b/ImageMagick-6.7.1-0-reason-error-message.patch index efd2c03..ae9a70d 100644 --- a/ImageMagick-6.7.1-0-reason-error-message.patch +++ b/ImageMagick-6.7.1-0-reason-error-message.patch @@ -1,8 +1,10 @@ ---- magick/exception.c 2011-09-06 15:31:15.000000000 +0200 -+++ magick/exception.c 2011-09-06 17:11:20.000000000 +0200 -@@ -458,7 +458,11 @@ MagickExport char *GetExceptionMessage(c - exception[MaxTextExtent]; +Index: magick/exception.c +=================================================================== +--- magick/exception.c.orig ++++ magick/exception.c +@@ -457,7 +457,11 @@ MagickExport char *GetExceptionMessage(c + *exception='\0'; #if defined(MAGICKCORE_HAVE_STRERROR_R) - (void) strerror_r(error,exception,sizeof(exception)); + #if !defined(_GNU_SOURCE) diff --git a/ImageMagick.spec b/ImageMagick.spec index a882a35..d72a24d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -566,4 +566,5 @@ Authors: HTML documentation for ImageMagick library and scene examples. + %changelog diff --git a/_service:format_spec_file:ImageMagick.spec b/_service:format_spec_file:ImageMagick.spec index d72a24d..62c3e7d 100644 --- a/_service:format_spec_file:ImageMagick.spec +++ b/_service:format_spec_file:ImageMagick.spec @@ -567,4 +567,5 @@ HTML documentation for ImageMagick library and scene examples. + %changelog From 2ae919a713752ad80dbfb958c2884a3b80721e098b45bc39e977d48752820c0c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 16 Sep 2011 11:27:24 +0000 Subject: [PATCH 07/10] remove noroot OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=82 --- ImageMagick.spec | 3 +- _service:format_spec_file:ImageMagick.spec | 571 --------------------- 2 files changed, 2 insertions(+), 572 deletions(-) delete mode 100644 _service:format_spec_file:ImageMagick.spec diff --git a/ImageMagick.spec b/ImageMagick.spec index d72a24d..469ea10 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %bcond_with xtp %bcond_without DCraw @@ -567,4 +566,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog diff --git a/_service:format_spec_file:ImageMagick.spec b/_service:format_spec_file:ImageMagick.spec deleted file mode 100644 index 62c3e7d..0000000 --- a/_service:format_spec_file:ImageMagick.spec +++ /dev/null @@ -1,571 +0,0 @@ -# -# spec file for package ImageMagick -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# 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 -%bcond_without WEBP - -Name: ImageMagick - -BuildRequires: fdupes 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 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 - -%if %{with WEBP} -BuildRequires: libwebp-devel -%endif - -%define xtp_version 5.4.3 -%define mfr_version 6.7.1 -%define mfr_revision 0 -%define source_version %{mfr_version}-%{mfr_revision} -License: Public Domain, Freeware -Group: Productivity/Graphics/Other -AutoReqProv: on -Version: %{mfr_version}.%{mfr_revision} -Release: 1 -%define libver 4 -Summary: Viewer and Converter for Images -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 -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 -Patch4: ImageMagick-6.7.1-0-reason-error-message.patch -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} -Summary: Perl interface for ImageMagick -Group: Development/Libraries/Perl -AutoReqProv: on - -%package devel -License: PERMISSIVE-OSI-COMPLIANT -Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{version} -Requires: ImageMagick = %{version} -Summary: Include Files and Libraries Mandatory for Development -Group: Development/Libraries/C and C++ -AutoReqProv: on -%if %{with FreeType} -Requires: freetype2-devel -%endif -%if %{with LCMS} -Requires: liblcms-devel -%endif -%if %{with TIFF} -Requires: libtiff-devel -%endif -%if %{with WMF} -Requires: libwmf-devel -%endif -%if %{with EXIF} -Requires: libexif-devel -%endif -%if %{with JPEG} -Requires: libjasper-devel -%endif -%if %{with WEBP} -Requires: libwebp-devel -%endif - -%package extra -License: PERMISSIVE-OSI-COMPLIANT -Requires: ImageMagick = %{version} libMagickCore%{libver} = %{version} -Summary: Viewer and Converter for Images - extra codecs -Group: Productivity/Graphics/Other -#delegates configured in delegates.xml that imagemagick can use -Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf -AutoReqProv: on - -%package -n libMagickCore%{libver} - -License: PERMISSIVE-OSI-COMPLIANT -Summary: Viewer and Converter for Images - runtime library -Group: Productivity/Graphics/Other -Suggests: ImageMagick-extra = %{version} -AutoReqProv: on - -%package -n libMagickWand%{libver} - -License: PERMISSIVE-OSI-COMPLIANT -Summary: Viewer and Converter for Images - runtime library -Group: Productivity/Graphics/Other -AutoReqProv: on - -%package -n libMagick++%{libver} - -License: PERMISSIVE-OSI-COMPLIANT -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++ = %{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 = %{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++ -%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 -%patch4 -# remove together with inc-struct.diff ---- -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} -%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:::" ltdl/ltdl.c.orig >ltdl/ltdl.c -%endif -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 \ - --enable-shared \ - --without-frozenpaths \ - --with-magick_plus_plus \ - --with-modules \ - --with-threads \ - --without-perl \ - --disable-static \ - --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} -%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 -export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs -export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs -export MAGICK_CONFIGURE_PATH=$PWD/config -cd PerlMagick -make test - -%install -%{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images' -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgdocdir=%{_defaultdocdir}/%{name}/ -cd PerlMagick -%{__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} 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 \ - -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}/%{name}/wand -%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api -%endif - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%post -n libMagickCore%{libver} -p /sbin/ldconfig - -%postun -n libMagickCore%{libver} -p /sbin/ldconfig - -%post -n libMagickWand%{libver} -p /sbin/ldconfig - -%postun -n libMagickWand%{libver} -p /sbin/ldconfig - -%post -n libMagick++%{libver} -p /sbin/ldconfig - -%postun -n libMagick++%{libver} -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%docdir %{_docdir}/%{name} -%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}* -%dir %{_libdir}/ImageMagick* -%dir %{_libdir}/ImageMagick*/modules* -%dir %{_libdir}/ImageMagick*/modules*/* -%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) -%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 -%{_libdir}/ImageMagick*/modules*/*/jp2.so -%{_libdir}/ImageMagick*/modules*/*/jp2.la -%{_libdir}/ImageMagick*/modules*/*/djvu.so -%{_libdir}/ImageMagick*/modules*/*/djvu.la - -%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 -%{_bindir}/Wand-config -%{_libdir}/pkgconfig/ImageMagick.pc -%{_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 -/var/adm/perl-modules/ImageMagick -%endif -%doc %{_mandir}/man3/Image::Magick.3pm* -%{perl_vendorarch}/auto/Image -%{perl_vendorarch}/Image - -%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 -%{_includedir}/ImageMagick/Magick++.h -%{_includedir}/ImageMagick/Magick++ -%{_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, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - - - -Authors: --------- - John Cristy - -%description devel -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - - - -Authors: --------- - John Cristy - -%description extra -This package adds support for djvu, wmf and jpeg2000 formats and -installs optional helper applications. - -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - - - -Authors: --------- - John Cristy - -%description -n libMagickCore%{libver} -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - - - -Authors: --------- - John Cristy - -%description -n libMagickWand%{libver} -ImageMagick is a robust collection of tools and libraries to read, -write, and manipulate an image in many image formats, including popular -formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - - - -Authors: --------- - John Cristy - -%description -n perl-PerlMagick -PerlMagick is an objected-oriented Perl interface to ImageMagick. Use -the module to read, manipulate, or write an image or image sequence -from within a Perl script. This makes it suitable for Web CGI scripts. - - - -Authors: --------- - John Cristy - -%description -n libMagick++%{libver} -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - - - -Authors: --------- - Bob Friesenhahn - -%description -n libMagick++-devel -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - - - -Authors: --------- - Bob Friesenhahn - -%description doc -HTML documentation for ImageMagick library and scene examples. - - - - -%changelog From 28283668de757b036a0b476dd8ffe996e5bec04414a807c604062a4c2146824c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 16 Sep 2011 19:11:41 +0000 Subject: [PATCH 08/10] Accepting request 82539 from home:jengelh:bl - Fix baselibs: add missing requires to ImageMagick-devel OBS-URL: https://build.opensuse.org/request/show/82539 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=83 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 2 ++ baselibs.conf | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index e56c99d..cd8589b 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de + +- Fix baselibs: add missing requires to ImageMagick-devel + ------------------------------------------------------------------- Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 469ea10..e313810 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -568,4 +568,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog diff --git a/baselibs.conf b/baselibs.conf index fc90ed9..0257de7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,6 @@ libMagickCore4 libMagickWand4 ImageMagick-devel - requires -ImageMagick- \ No newline at end of file + requires -ImageMagick- + requires "libMagickCore4- = " + requires "libMagickWand4- = " From dfc0d3a3e6d3f9a0b3d0a760c83f0adac3a61f07243f808b68d27cfb2bb5dddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 17 Sep 2011 08:20:44 +0000 Subject: [PATCH 09/10] Accepting request 82576 from home:jengelh:bl - Remove redundant tags/sections OBS-URL: https://build.opensuse.org/request/show/82576 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=84 --- ImageMagick.changes | 1 + ImageMagick.spec | 19 +++++-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index cd8589b..a79763e 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,6 +2,7 @@ Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de - Fix baselibs: add missing requires to ImageMagick-devel +- Remove redundant tags/sections ------------------------------------------------------------------- Wed Sep 7 08:53:45 UTC 2011 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index e313810..08788c1 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -88,7 +88,6 @@ BuildRequires: libwebp-devel %define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other -AutoReqProv: on Version: %{mfr_version}.%{mfr_revision} Release: 1 %define libver 4 @@ -117,7 +116,6 @@ License: Public Domain, Freeware Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl -AutoReqProv: on %package devel License: PERMISSIVE-OSI-COMPLIANT @@ -125,7 +123,6 @@ Requires: libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{v Requires: ImageMagick = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ -AutoReqProv: on %if %{with FreeType} Requires: freetype2-devel %endif @@ -155,7 +152,6 @@ Summary: Viewer and Converter for Images - extra codecs Group: Productivity/Graphics/Other #delegates configured in delegates.xml that imagemagick can use Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf -AutoReqProv: on %package -n libMagickCore%{libver} @@ -163,14 +159,12 @@ License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} -AutoReqProv: on %package -n libMagickWand%{libver} License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other -AutoReqProv: on %package -n libMagick++%{libver} @@ -178,7 +172,6 @@ License: PERMISSIVE-OSI-COMPLIANT 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++ = %{version} Obsoletes: ImageMagick-Magick++ < %{version} @@ -190,7 +183,6 @@ Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ Provides: ImageMagick-Magick++-devel = %{version} Obsoletes: ImageMagick-Magick++-devel < %{version} -AutoReqProv: on %package doc License: PERMISSIVE-OSI-COMPLIANT @@ -250,15 +242,15 @@ popd --without-perl \ --disable-static \ --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" -make %{?jobs:-j%jobs} all +make %{?_smp_mflags} all cd PerlMagick perl Makefile.PL -make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" +make %{?_smp_mflags} 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:-j%jobs} +make %{?_smp_mflags} %endif %check @@ -301,9 +293,6 @@ echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api %endif -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %post -n libMagickCore%{libver} -p /sbin/ldconfig %postun -n libMagickCore%{libver} -p /sbin/ldconfig @@ -570,4 +559,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog From 1b2c77133c5e58da44d60061fe6b03608dddbd61b4ac402342679a985708fce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 17 Sep 2011 10:03:44 +0000 Subject: [PATCH 10/10] Accepting request 82643 from home:jengelh:bl - Remove redundant tags/sections from specfile OBS-URL: https://build.opensuse.org/request/show/82643 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=85 --- ImageMagick.changes | 5 ++++ ImageMagick.spec | 57 --------------------------------------------- 2 files changed, 5 insertions(+), 57 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index a79763e..a437062 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 17 09:36:34 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Fri Sep 16 17:34:10 UTC 2011 - jengelh@medozas.de diff --git a/ImageMagick.spec b/ImageMagick.spec index 08788c1..92cc40e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -154,20 +154,17 @@ Group: Productivity/Graphics/Other Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf %package -n libMagickCore%{libver} - License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} %package -n libMagickWand%{libver} - License: PERMISSIVE-OSI-COMPLIANT Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other %package -n libMagick++%{libver} - License: PERMISSIVE-OSI-COMPLIANT Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library @@ -420,12 +417,6 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and PERL-based programming interfaces. - - -Authors: --------- - John Cristy - %description devel ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular @@ -437,12 +428,6 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and PERL-based programming interfaces. - - -Authors: --------- - John Cristy - %description extra This package adds support for djvu, wmf and jpeg2000 formats and installs optional helper applications. @@ -457,12 +442,6 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and PERL-based programming interfaces. - - -Authors: --------- - John Cristy - %description -n libMagickCore%{libver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular @@ -474,12 +453,6 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and PERL-based programming interfaces. - - -Authors: --------- - John Cristy - %description -n libMagickWand%{libver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular @@ -491,23 +464,11 @@ different image formats. Image processing operations are available from the command line as well as through C, C++, and PERL-based programming interfaces. - - -Authors: --------- - John Cristy - %description -n perl-PerlMagick PerlMagick is an objected-oriented Perl interface to ImageMagick. Use the module to read, manipulate, or write an image or image sequence from within a Perl script. This makes it suitable for Web CGI scripts. - - -Authors: --------- - John Cristy - %description -n libMagick++%{libver} This is Magick++, the object-oriented C++ API for the ImageMagick image-processing library. @@ -523,12 +484,6 @@ De-referenced copies are automatically deleted. The image objects support value (rather than pointer) semantics so it is trivial to support multiple generations of an image in memory at one time. - - -Authors: --------- - Bob Friesenhahn - %description -n libMagick++-devel This is Magick++, the object-oriented C++ API for the ImageMagick image-processing library. @@ -544,21 +499,9 @@ De-referenced copies are automatically deleted. The image objects support value (rather than pointer) semantics so it is trivial to support multiple generations of an image in memory at one time. - - -Authors: --------- - Bob Friesenhahn - %description doc HTML documentation for ImageMagick library and scene examples. - - - - - - %changelog