Accepting request 111463 from graphics
- cleanup the package - updated to 6.7.6.1: fixes * CVE-2012-0247 [bnc#746880] * CVE-2012-0248 [bnc#746880] * CVE-2012-1185 [bnc#752879] * CVE-2012-1186 [bnc#752879] - moved the libtool archives to the main package - separated the bulk documentation - added a regression %check for the locale comma crash OBS-URL: https://build.opensuse.org/request/show/111463 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=80
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
24593d71c1
@ -1,825 +0,0 @@
|
||||
Only in old: AUTHORS.txt
|
||||
Only in old: ChangeLog
|
||||
Only in old: ImageMagick.spec.in
|
||||
Only in old: Install-mac.txt
|
||||
Only in old: Install-unix.txt
|
||||
Only in old: Install-vms.txt
|
||||
Only in old: Install-windows.txt
|
||||
Only in old: LICENSE
|
||||
Only in old: Magick++
|
||||
Only in old: Magickshr.opt
|
||||
Only in old: Make.com
|
||||
Only in old: Makefile.am
|
||||
Only in old: Makefile.in
|
||||
Only in old: NEWS.txt
|
||||
Only in old: NOTICE
|
||||
Only in old: PerlMagick
|
||||
Only in old: Platforms.txt
|
||||
Only in old: QuickStart.txt
|
||||
Only in old: README.txt
|
||||
Only in old: aclocal.m4
|
||||
Only in old: check-headers.c
|
||||
Only in old: coders
|
||||
Only in old: config
|
||||
Only in old: configure
|
||||
Only in old: configure.ac
|
||||
Only in old: filters
|
||||
Only in old: images
|
||||
Only in old: index.html
|
||||
Only in old: ltdl
|
||||
Only in old: m4
|
||||
Only in old/magick: ImageMagick.h
|
||||
Only in old/magick: ImageMagick.pc.in
|
||||
Only in old/magick: Magick-config.1
|
||||
Only in old/magick: Magick-config.in
|
||||
Only in old/magick: MagickCore-config.1
|
||||
Only in old/magick: MagickCore-config.in
|
||||
Index: ImageMagick-6.7.1-0/magick/MagickCore.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/MagickCore.h
|
||||
+++ ImageMagick-6.7.1-0/magick/MagickCore.h
|
||||
@@ -26,7 +26,7 @@ extern "C" {
|
||||
#if !defined(_MAGICKCORE_CONFIG_H)
|
||||
# define _MAGICKCORE_CONFIG_H
|
||||
# if !defined(vms) && !defined(macintosh)
|
||||
-# include "magick/magick-config.h"
|
||||
+# include "magick-config.h"
|
||||
# else
|
||||
# include "magick-config.h"
|
||||
# endif
|
||||
@@ -124,88 +124,88 @@ extern "C" {
|
||||
#if defined(MAGICKCORE_NAMESPACE_PREFIX)
|
||||
# include "magick/methods.h"
|
||||
#endif
|
||||
-#include "magick/magick-type.h"
|
||||
-#include "magick/accelerate.h"
|
||||
-#include "magick/animate.h"
|
||||
-#include "magick/annotate.h"
|
||||
-#include "magick/artifact.h"
|
||||
-#include "magick/attribute.h"
|
||||
-#include "magick/blob.h"
|
||||
-#include "magick/cache.h"
|
||||
-#include "magick/cache-view.h"
|
||||
-#include "magick/cipher.h"
|
||||
-#include "magick/client.h"
|
||||
-#include "magick/coder.h"
|
||||
-#include "magick/color.h"
|
||||
-#include "magick/colorspace.h"
|
||||
-#include "magick/colormap.h"
|
||||
-#include "magick/compare.h"
|
||||
-#include "magick/composite.h"
|
||||
-#include "magick/compress.h"
|
||||
-#include "magick/configure.h"
|
||||
-#include "magick/constitute.h"
|
||||
-#include "magick/decorate.h"
|
||||
-#include "magick/delegate.h"
|
||||
-#include "magick/deprecate.h"
|
||||
-#include "magick/display.h"
|
||||
-#include "magick/distort.h"
|
||||
-#include "magick/draw.h"
|
||||
-#include "magick/effect.h"
|
||||
-#include "magick/enhance.h"
|
||||
-#include "magick/exception.h"
|
||||
-#include "magick/feature.h"
|
||||
-#include "magick/fourier.h"
|
||||
-#include "magick/fx.h"
|
||||
-#include "magick/gem.h"
|
||||
-#include "magick/geometry.h"
|
||||
-#include "magick/hashmap.h"
|
||||
-#include "magick/histogram.h"
|
||||
-#include "magick/identify.h"
|
||||
-#include "magick/image.h"
|
||||
-#include "magick/image-view.h"
|
||||
-#include "magick/layer.h"
|
||||
-#include "magick/list.h"
|
||||
-#include "magick/locale_.h"
|
||||
-#include "magick/log.h"
|
||||
-#include "magick/magic.h"
|
||||
-#include "magick/magick.h"
|
||||
-#include "magick/matrix.h"
|
||||
-#include "magick/memory_.h"
|
||||
-#include "magick/module.h"
|
||||
-#include "magick/mime.h"
|
||||
-#include "magick/monitor.h"
|
||||
-#include "magick/montage.h"
|
||||
-#include "magick/morphology.h"
|
||||
-#include "magick/option.h"
|
||||
-#include "magick/paint.h"
|
||||
-#include "magick/pixel.h"
|
||||
-#include "magick/policy.h"
|
||||
-#include "magick/prepress.h"
|
||||
-#include "magick/profile.h"
|
||||
-#include "magick/property.h"
|
||||
-#include "magick/quantize.h"
|
||||
-#include "magick/quantum.h"
|
||||
-#include "magick/registry.h"
|
||||
-#include "magick/random_.h"
|
||||
-#include "magick/resample.h"
|
||||
-#include "magick/resize.h"
|
||||
-#include "magick/resource_.h"
|
||||
-#include "magick/segment.h"
|
||||
-#include "magick/shear.h"
|
||||
-#include "magick/signature.h"
|
||||
-#include "magick/splay-tree.h"
|
||||
-#include "magick/stream.h"
|
||||
-#include "magick/statistic.h"
|
||||
-#include "magick/string_.h"
|
||||
-#include "magick/timer.h"
|
||||
-#include "magick/token.h"
|
||||
-#include "magick/transform.h"
|
||||
-#include "magick/threshold.h"
|
||||
-#include "magick/type.h"
|
||||
-#include "magick/utility.h"
|
||||
-#include "magick/version.h"
|
||||
-#include "magick/xml-tree.h"
|
||||
-#include "magick/xwindow.h"
|
||||
+#include "magick-type.h"
|
||||
+#include "accelerate.h"
|
||||
+#include "animate.h"
|
||||
+#include "annotate.h"
|
||||
+#include "artifact.h"
|
||||
+#include "attribute.h"
|
||||
+#include "blob.h"
|
||||
+#include "cache.h"
|
||||
+#include "cache-view.h"
|
||||
+#include "cipher.h"
|
||||
+#include "client.h"
|
||||
+#include "coder.h"
|
||||
+#include "color.h"
|
||||
+#include "colorspace.h"
|
||||
+#include "colormap.h"
|
||||
+#include "compare.h"
|
||||
+#include "composite.h"
|
||||
+#include "compress.h"
|
||||
+#include "configure.h"
|
||||
+#include "constitute.h"
|
||||
+#include "decorate.h"
|
||||
+#include "delegate.h"
|
||||
+#include "deprecate.h"
|
||||
+#include "display.h"
|
||||
+#include "distort.h"
|
||||
+#include "draw.h"
|
||||
+#include "effect.h"
|
||||
+#include "enhance.h"
|
||||
+#include "exception.h"
|
||||
+#include "feature.h"
|
||||
+#include "fourier.h"
|
||||
+#include "fx.h"
|
||||
+#include "gem.h"
|
||||
+#include "geometry.h"
|
||||
+#include "hashmap.h"
|
||||
+#include "histogram.h"
|
||||
+#include "identify.h"
|
||||
+#include "image.h"
|
||||
+#include "image-view.h"
|
||||
+#include "layer.h"
|
||||
+#include "list.h"
|
||||
+#include "locale_.h"
|
||||
+#include "log.h"
|
||||
+#include "magic.h"
|
||||
+#include "magick.h"
|
||||
+#include "matrix.h"
|
||||
+#include "memory_.h"
|
||||
+#include "module.h"
|
||||
+#include "mime.h"
|
||||
+#include "monitor.h"
|
||||
+#include "montage.h"
|
||||
+#include "morphology.h"
|
||||
+#include "option.h"
|
||||
+#include "paint.h"
|
||||
+#include "pixel.h"
|
||||
+#include "policy.h"
|
||||
+#include "prepress.h"
|
||||
+#include "profile.h"
|
||||
+#include "property.h"
|
||||
+#include "quantize.h"
|
||||
+#include "quantum.h"
|
||||
+#include "registry.h"
|
||||
+#include "random_.h"
|
||||
+#include "resample.h"
|
||||
+#include "resize.h"
|
||||
+#include "resource_.h"
|
||||
+#include "segment.h"
|
||||
+#include "shear.h"
|
||||
+#include "signature.h"
|
||||
+#include "splay-tree.h"
|
||||
+#include "stream.h"
|
||||
+#include "statistic.h"
|
||||
+#include "string_.h"
|
||||
+#include "timer.h"
|
||||
+#include "token.h"
|
||||
+#include "transform.h"
|
||||
+#include "threshold.h"
|
||||
+#include "type.h"
|
||||
+#include "utility.h"
|
||||
+#include "version.h"
|
||||
+#include "xml-tree.h"
|
||||
+#include "xwindow.h"
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
Index: ImageMagick-6.7.1-0/magick/accelerate.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/accelerate.h
|
||||
+++ ImageMagick-6.7.1-0/magick/accelerate.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/morphology.h>
|
||||
+#include "morphology.h"
|
||||
|
||||
extern MagickExport MagickBooleanType
|
||||
AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
|
||||
Index: ImageMagick-6.7.1-0/magick/annotate.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/annotate.h
|
||||
+++ ImageMagick-6.7.1-0/magick/annotate.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/draw.h"
|
||||
+#include "draw.h"
|
||||
|
||||
extern MagickExport MagickBooleanType
|
||||
AnnotateComponentGenesis(void),
|
||||
Index: ImageMagick-6.7.1-0/magick/attribute.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/attribute.h
|
||||
+++ ImageMagick-6.7.1-0/magick/attribute.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/image.h>
|
||||
-#include <magick/exception.h>
|
||||
+#include "image.h"
|
||||
+#include "exception.h"
|
||||
|
||||
extern MagickExport ImageType
|
||||
GetImageType(const Image *,ExceptionInfo *);
|
||||
Index: ImageMagick-6.7.1-0/magick/blob.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/blob.h
|
||||
+++ ImageMagick-6.7.1-0/magick/blob.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/image.h"
|
||||
-#include "magick/stream.h"
|
||||
+#include "image.h"
|
||||
+#include "stream.h"
|
||||
|
||||
#define MagickMaxBufferExtent (32*8192)
|
||||
|
||||
Index: ImageMagick-6.7.1-0/magick/cache-view.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/cache-view.h
|
||||
+++ ImageMagick-6.7.1-0/magick/cache-view.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/pixel.h"
|
||||
+#include "pixel.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/cache.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/cache.h
|
||||
+++ ImageMagick-6.7.1-0/magick/cache.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/blob.h"
|
||||
+#include "blob.h"
|
||||
|
||||
extern MagickExport const IndexPacket
|
||||
*GetVirtualIndexQueue(const Image *);
|
||||
Index: ImageMagick-6.7.1-0/magick/color.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/color.h
|
||||
+++ ImageMagick-6.7.1-0/magick/color.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/pixel.h>
|
||||
-#include <magick/exception.h>
|
||||
+#include "pixel.h"
|
||||
+#include "exception.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/compare.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/compare.h
|
||||
+++ ImageMagick-6.7.1-0/magick/compare.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/image.h"
|
||||
+#include "image.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/configure.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/configure.h
|
||||
+++ ImageMagick-6.7.1-0/magick/configure.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/hashmap.h"
|
||||
+#include "hashmap.h"
|
||||
|
||||
typedef struct _ConfigureInfo
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/deprecate.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/deprecate.h
|
||||
+++ ImageMagick-6.7.1-0/magick/deprecate.h
|
||||
@@ -25,16 +25,16 @@ extern "C" {
|
||||
#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
|
||||
|
||||
#include <stdarg.h>
|
||||
-#include "magick/blob.h"
|
||||
-#include "magick/cache-view.h"
|
||||
-#include "magick/draw.h"
|
||||
-#include "magick/constitute.h"
|
||||
-#include "magick/magick-config.h"
|
||||
-#include "magick/pixel.h"
|
||||
-#include "magick/quantize.h"
|
||||
-#include "magick/quantum.h"
|
||||
-#include "magick/registry.h"
|
||||
-#include "magick/semaphore.h"
|
||||
+#include "blob.h"
|
||||
+#include "cache-view.h"
|
||||
+#include "draw.h"
|
||||
+#include "constitute.h"
|
||||
+#include "magick-config.h"
|
||||
+#include "pixel.h"
|
||||
+#include "quantize.h"
|
||||
+#include "quantum.h"
|
||||
+#include "registry.h"
|
||||
+#include "semaphore.h"
|
||||
|
||||
#if !defined(magick_attribute)
|
||||
# if !defined(__GNUC__)
|
||||
Index: ImageMagick-6.7.1-0/magick/draw.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/draw.h
|
||||
+++ ImageMagick-6.7.1-0/magick/draw.h
|
||||
@@ -22,10 +22,10 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/geometry.h"
|
||||
-#include "magick/image.h"
|
||||
-#include "magick/pixel.h"
|
||||
-#include "magick/type.h"
|
||||
+#include "geometry.h"
|
||||
+#include "image.h"
|
||||
+#include "pixel.h"
|
||||
+#include "type.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/effect.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/effect.h
|
||||
+++ ImageMagick-6.7.1-0/magick/effect.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/morphology.h>
|
||||
+#include "morphology.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/exception.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/exception.h
|
||||
+++ ImageMagick-6.7.1-0/magick/exception.h
|
||||
@@ -23,7 +23,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
-#include "magick/semaphore.h"
|
||||
+#include "semaphore.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/fx.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/fx.h
|
||||
+++ ImageMagick-6.7.1-0/magick/fx.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/draw.h"
|
||||
+#include "draw.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/gem.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/gem.h
|
||||
+++ ImageMagick-6.7.1-0/magick/gem.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/fx.h>
|
||||
-#include <magick/random_.h>
|
||||
+#include "fx.h"
|
||||
+#include "random_.h"
|
||||
|
||||
extern MagickExport double
|
||||
ExpandAffine(const AffineMatrix *),
|
||||
Index: ImageMagick-6.7.1-0/magick/image.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/image.h
|
||||
+++ ImageMagick-6.7.1-0/magick/image.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/color.h>
|
||||
+#include "color.h"
|
||||
|
||||
#define OpaqueOpacity ((Quantum) 0UL)
|
||||
#define TransparentOpacity ((Quantum) QuantumRange)
|
||||
@@ -125,25 +125,25 @@ typedef struct _ChromaticityInfo
|
||||
white_point;
|
||||
} ChromaticityInfo;
|
||||
|
||||
-#include "magick/blob.h"
|
||||
-#include "magick/colorspace.h"
|
||||
-#include "magick/cache-view.h"
|
||||
-#include "magick/color.h"
|
||||
-#include "magick/composite.h"
|
||||
-#include "magick/compress.h"
|
||||
-#include "magick/effect.h"
|
||||
-#include "magick/geometry.h"
|
||||
-#include "magick/layer.h"
|
||||
-#include "magick/locale_.h"
|
||||
-#include "magick/monitor.h"
|
||||
-#include "magick/pixel.h"
|
||||
-#include "magick/profile.h"
|
||||
-#include "magick/quantum.h"
|
||||
-#include "magick/resample.h"
|
||||
-#include "magick/resize.h"
|
||||
-#include "magick/semaphore.h"
|
||||
-#include "magick/stream.h"
|
||||
-#include "magick/timer.h"
|
||||
+#include "blob.h"
|
||||
+#include "colorspace.h"
|
||||
+#include "cache-view.h"
|
||||
+#include "color.h"
|
||||
+#include "composite.h"
|
||||
+#include "compress.h"
|
||||
+#include "effect.h"
|
||||
+#include "geometry.h"
|
||||
+#include "layer.h"
|
||||
+#include "locale_.h"
|
||||
+#include "monitor.h"
|
||||
+#include "pixel.h"
|
||||
+#include "profile.h"
|
||||
+#include "quantum.h"
|
||||
+#include "resample.h"
|
||||
+#include "resize.h"
|
||||
+#include "semaphore.h"
|
||||
+#include "stream.h"
|
||||
+#include "timer.h"
|
||||
|
||||
struct _Image
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/locale_.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/locale_.h
|
||||
+++ ImageMagick-6.7.1-0/magick/locale_.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/hashmap.h"
|
||||
+#include "hashmap.h"
|
||||
|
||||
typedef struct _LocaleInfo
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/log.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/log.h
|
||||
+++ ImageMagick-6.7.1-0/magick/log.h
|
||||
@@ -23,7 +23,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
-#include "magick/exception.h"
|
||||
+#include "exception.h"
|
||||
|
||||
#if !defined(GetMagickModule)
|
||||
# define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__
|
||||
Index: ImageMagick-6.7.1-0/magick/magick-type.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/magick-type.h
|
||||
+++ ImageMagick-6.7.1-0/magick/magick-type.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/magick-config.h"
|
||||
+#include "magick-config.h"
|
||||
|
||||
#if !defined(MAGICKCORE_QUANTUM_DEPTH)
|
||||
#define MAGICKCORE_QUANTUM_DEPTH 16
|
||||
Index: ImageMagick-6.7.1-0/magick/module.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/module.h
|
||||
+++ ImageMagick-6.7.1-0/magick/module.h
|
||||
@@ -23,7 +23,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include <time.h>
|
||||
-#include "magick/version.h"
|
||||
+#include "version.h"
|
||||
|
||||
#define MagickImageCoderSignature ((size_t) \
|
||||
(((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
|
||||
Index: ImageMagick-6.7.1-0/magick/morphology.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/morphology.h
|
||||
+++ ImageMagick-6.7.1-0/magick/morphology.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/geometry.h>
|
||||
+#include "geometry.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/paint.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/paint.h
|
||||
+++ ImageMagick-6.7.1-0/magick/paint.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/color.h"
|
||||
-#include "magick/draw.h"
|
||||
+#include "color.h"
|
||||
+#include "draw.h"
|
||||
|
||||
extern MagickExport Image
|
||||
*OilPaintImage(const Image *,const double,ExceptionInfo *);
|
||||
Index: ImageMagick-6.7.1-0/magick/pixel.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/pixel.h
|
||||
+++ ImageMagick-6.7.1-0/magick/pixel.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/colorspace.h>
|
||||
-#include <magick/constitute.h>
|
||||
+#include "colorspace.h"
|
||||
+#include "constitute.h"
|
||||
|
||||
#define ClampPixelRed(pixel) ClampToQuantum((pixel)->red)
|
||||
#define ClampPixelGreen(pixel) ClampToQuantum((pixel)->green)
|
||||
Index: ImageMagick-6.7.1-0/magick/policy.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/policy.h
|
||||
+++ ImageMagick-6.7.1-0/magick/policy.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/pixel.h>
|
||||
-#include <magick/exception.h>
|
||||
+#include "pixel.h"
|
||||
+#include "exception.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/profile.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/profile.h
|
||||
+++ ImageMagick-6.7.1-0/magick/profile.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/string_.h"
|
||||
+#include "string_.h"
|
||||
|
||||
typedef struct _ProfileInfo
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/quantize.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/quantize.h
|
||||
+++ ImageMagick-6.7.1-0/magick/quantize.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/colorspace.h"
|
||||
+#include "colorspace.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/quantum.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/quantum.h
|
||||
+++ ImageMagick-6.7.1-0/magick/quantum.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/semaphore.h"
|
||||
+#include "semaphore.h"
|
||||
|
||||
#define RoundToQuantum(quantum) ClampToQuantum(quantum)
|
||||
|
||||
Index: ImageMagick-6.7.1-0/magick/random_.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/random_.h
|
||||
+++ ImageMagick-6.7.1-0/magick/random_.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "magick/string_.h"
|
||||
+#include "string_.h"
|
||||
|
||||
/*
|
||||
Typedef declarations.
|
||||
Index: ImageMagick-6.7.1-0/magick/resample.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/resample.h
|
||||
+++ ImageMagick-6.7.1-0/magick/resample.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/cache-view.h>
|
||||
+#include "cache-view.h"
|
||||
|
||||
/*
|
||||
WARNING: The order of this table must also match the order of a table
|
||||
Index: ImageMagick-6.7.1-0/magick/string_.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/string_.h
|
||||
+++ ImageMagick-6.7.1-0/magick/string_.h
|
||||
@@ -24,7 +24,7 @@ extern "C" {
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <time.h>
|
||||
-#include "magick/exception.h"
|
||||
+#include "exception.h"
|
||||
|
||||
typedef struct _StringInfo
|
||||
{
|
||||
Index: ImageMagick-6.7.1-0/magick/xml-tree.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/magick/xml-tree.h
|
||||
+++ ImageMagick-6.7.1-0/magick/xml-tree.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <magick/exception.h>
|
||||
-#include <magick/splay-tree.h>
|
||||
+#include "exception.h"
|
||||
+#include "splay-tree.h"
|
||||
|
||||
typedef struct _XMLTreeInfo
|
||||
XMLTreeInfo;
|
||||
Index: ImageMagick-6.7.1-0/wand/MagickWand.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/wand/MagickWand.h
|
||||
+++ ImageMagick-6.7.1-0/wand/MagickWand.h
|
||||
@@ -26,7 +26,7 @@ extern "C" {
|
||||
#if !defined(_MAGICKWAND_CONFIG_H)
|
||||
# define _MAGICKWAND_CONFIG_H
|
||||
# if !defined(vms) && !defined(macintosh)
|
||||
-# include "magick/magick-config.h"
|
||||
+# include "../magick/magick-config.h"
|
||||
# else
|
||||
# include "magick-config.h"
|
||||
# endif
|
||||
@@ -124,25 +124,25 @@ extern "C" {
|
||||
typedef struct _MagickWand
|
||||
MagickWand;
|
||||
|
||||
-#include "magick/MagickCore.h"
|
||||
-#include "wand/animate.h"
|
||||
-#include "wand/compare.h"
|
||||
-#include "wand/composite.h"
|
||||
-#include "wand/conjure.h"
|
||||
-#include "wand/convert.h"
|
||||
-#include "wand/deprecate.h"
|
||||
-#include "wand/display.h"
|
||||
-#include "wand/drawing-wand.h"
|
||||
-#include "wand/identify.h"
|
||||
-#include "wand/import.h"
|
||||
-#include "wand/magick-property.h"
|
||||
-#include "wand/magick-image.h"
|
||||
-#include "wand/mogrify.h"
|
||||
-#include "wand/montage.h"
|
||||
-#include "wand/pixel-iterator.h"
|
||||
-#include "wand/pixel-wand.h"
|
||||
-#include "wand/stream.h"
|
||||
-#include "wand/wand-view.h"
|
||||
+#include "../magick/MagickCore.h"
|
||||
+#include "animate.h"
|
||||
+#include "compare.h"
|
||||
+#include "composite.h"
|
||||
+#include "conjure.h"
|
||||
+#include "convert.h"
|
||||
+#include "deprecate.h"
|
||||
+#include "display.h"
|
||||
+#include "drawing-wand.h"
|
||||
+#include "identify.h"
|
||||
+#include "import.h"
|
||||
+#include "magick-property.h"
|
||||
+#include "magick-image.h"
|
||||
+#include "mogrify.h"
|
||||
+#include "montage.h"
|
||||
+#include "pixel-iterator.h"
|
||||
+#include "pixel-wand.h"
|
||||
+#include "stream.h"
|
||||
+#include "wand-view.h"
|
||||
|
||||
extern WandExport char
|
||||
*MagickGetException(const MagickWand *,ExceptionType *);
|
||||
Index: ImageMagick-6.7.1-0/wand/deprecate.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/wand/deprecate.h
|
||||
+++ ImageMagick-6.7.1-0/wand/deprecate.h
|
||||
@@ -24,10 +24,10 @@ extern "C" {
|
||||
|
||||
#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
|
||||
|
||||
-#include "wand/drawing-wand.h"
|
||||
-#include "wand/magick-wand.h"
|
||||
-#include "wand/pixel-iterator.h"
|
||||
-#include "wand/pixel-wand.h"
|
||||
+#include "drawing-wand.h"
|
||||
+#include "magick-wand.h"
|
||||
+#include "pixel-iterator.h"
|
||||
+#include "pixel-wand.h"
|
||||
|
||||
typedef struct _DrawingWand
|
||||
*DrawContext;
|
||||
Index: ImageMagick-6.7.1-0/wand/drawing-wand.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/wand/drawing-wand.h
|
||||
+++ ImageMagick-6.7.1-0/wand/drawing-wand.h
|
||||
@@ -22,7 +22,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "wand/pixel-wand.h"
|
||||
+#include "pixel-wand.h"
|
||||
|
||||
typedef struct _DrawingWand
|
||||
DrawingWand;
|
||||
Index: ImageMagick-6.7.1-0/wand/magick-wand.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/wand/magick-wand.h
|
||||
+++ ImageMagick-6.7.1-0/wand/magick-wand.h
|
||||
@@ -19,6 +19,6 @@
|
||||
#ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
|
||||
#define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
|
||||
|
||||
-#include "wand/MagickWand.h"
|
||||
+#include "MagickWand.h"
|
||||
|
||||
#endif
|
||||
Index: ImageMagick-6.7.1-0/wand/pixel-iterator.h
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.1-0.orig/wand/pixel-iterator.h
|
||||
+++ ImageMagick-6.7.1-0/wand/pixel-iterator.h
|
||||
@@ -22,8 +22,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include "wand/magick-wand.h"
|
||||
-#include "wand/pixel-wand.h"
|
||||
+#include "magick-wand.h"
|
||||
+#include "pixel-wand.h"
|
||||
|
||||
typedef struct _PixelIterator
|
||||
PixelIterator;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dd3275418baf033bbd356f2f95fa8ded27b22ac572b6f7f9b69a1103dfafb649
|
||||
size 10402402
|
||||
3
ImageMagick-6.7.6-1.tar.bz2
Normal file
3
ImageMagick-6.7.6-1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb96ebd585f8a3e0c4638fc6383ef6fedcb2f36783c0a90ff8e2c95af20f9baa
|
||||
size 10417616
|
||||
13
ImageMagick-6.7.6.1-no-dist-lzip.patch
Normal file
13
ImageMagick-6.7.6.1-no-dist-lzip.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: ImageMagick-6.7.6-1/configure.ac
|
||||
===================================================================
|
||||
--- ImageMagick-6.7.6-1.orig/configure.ac
|
||||
+++ ImageMagick-6.7.6-1/configure.ac
|
||||
@@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
|
||||
# Ensure that make can run correctly
|
||||
AM_SANITY_CHECK
|
||||
|
||||
-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip])
|
||||
+AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip])
|
||||
|
||||
# Enable support for silent build rules
|
||||
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 27 16:20:53 UTC 2012 - pgajdos@suse.com
|
||||
|
||||
- cleanup the package
|
||||
- updated to 6.7.6.1: fixes
|
||||
* CVE-2012-0247 [bnc#746880]
|
||||
* CVE-2012-0248 [bnc#746880]
|
||||
* CVE-2012-1185 [bnc#752879]
|
||||
* CVE-2012-1186 [bnc#752879]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 9 9:4:11 UTC 2012 - giecrilj@stegny.2a.pl
|
||||
|
||||
- moved the libtool archives to the main package
|
||||
- separated the bulk documentation
|
||||
- added a regression %check for the locale comma crash
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 09:02:14 UTC 2012 - cfarrell@suse.com
|
||||
|
||||
|
||||
135
ImageMagick.spec
135
ImageMagick.spec
@ -15,21 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%bcond_with xtp
|
||||
%bcond_without DCraw
|
||||
%bcond_without FreeType
|
||||
%bcond_without CXX
|
||||
%bcond_without Ghostscript
|
||||
%bcond_without LCMS
|
||||
%bcond_without TIFF
|
||||
%bcond_without WMF
|
||||
%bcond_without XML
|
||||
%bcond_without DejaVu
|
||||
%bcond_without EXIF
|
||||
%bcond_without JPEG
|
||||
%bcond_without WEBP
|
||||
# build against librsvg [bnc#724222]
|
||||
%bcond_without RSVG
|
||||
|
||||
|
||||
Name: ImageMagick
|
||||
|
||||
@ -38,63 +24,24 @@ BuildRequires: libbz2-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: lzma-devel
|
||||
BuildRequires: pkgconfig
|
||||
%if %{with DCraw}
|
||||
BuildRequires: dcraw
|
||||
%endif
|
||||
|
||||
%if %{with FreeType}
|
||||
BuildRequires: freetype2-devel
|
||||
%endif
|
||||
|
||||
%if %{with CXX}
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
|
||||
%if %{with Ghostscript}
|
||||
BuildRequires: ghostscript-fonts-other
|
||||
BuildRequires: ghostscript-fonts-std
|
||||
BuildRequires: ghostscript-library
|
||||
%endif
|
||||
|
||||
%if %{with LCMS}
|
||||
BuildRequires: liblcms2-devel
|
||||
%endif
|
||||
|
||||
%if %{with TIFF}
|
||||
BuildRequires: libtiff-devel
|
||||
%endif
|
||||
|
||||
%if %{with WMF}
|
||||
BuildRequires: libwmf-devel
|
||||
%endif
|
||||
|
||||
%if %{with XML}
|
||||
BuildRequires: libxml2-devel
|
||||
%endif
|
||||
|
||||
%if %{with DejaVu}
|
||||
BuildRequires: libdjvulibre-devel
|
||||
%endif
|
||||
|
||||
%if %{with EXIF}
|
||||
BuildRequires: libexif-devel
|
||||
%endif
|
||||
|
||||
%if %{with JPEG}
|
||||
BuildRequires: libjasper-devel
|
||||
%endif
|
||||
|
||||
%if %{with WEBP}
|
||||
BuildRequires: libwebp-devel
|
||||
%endif
|
||||
|
||||
%if %{with RSVG}
|
||||
BuildRequires: librsvg-devel
|
||||
%endif
|
||||
|
||||
%define xtp_version 5.4.3
|
||||
%define mfr_version 6.7.4
|
||||
%define mfr_revision 7
|
||||
%define mfr_version 6.7.6
|
||||
%define mfr_revision 1
|
||||
%define source_version %{mfr_version}-%{mfr_revision}
|
||||
Version: %{mfr_version}.%{mfr_revision}
|
||||
Release: 0
|
||||
@ -106,19 +53,11 @@ 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
|
||||
Source2: baselibs.conf
|
||||
Patch1: ImageMagick-6.6.8.9-examples.patch
|
||||
Patch2: ImageMagick-6.6.8.9-doc.patch
|
||||
# remove inc-struct.diff as soon as it will be not comfortable to port
|
||||
# see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
|
||||
# for upstream progress
|
||||
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
||||
Patch3: ImageMagick-6.7.6.1-no-dist-lzip.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: imagemag = %{version}
|
||||
Obsoletes: imagemag < %{version}
|
||||
|
||||
%package -n perl-PerlMagick
|
||||
Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
|
||||
@ -160,17 +99,12 @@ Requires: ImageMagick
|
||||
Summary: C++ Interface for ImageMagick - runtime library
|
||||
License: SUSE-ImageMagick
|
||||
Group: Development/Libraries/C and C++
|
||||
# was last used in openSUSE 10.2
|
||||
Provides: ImageMagick-Magick++ = %{version}
|
||||
Obsoletes: ImageMagick-Magick++ < %{version}
|
||||
|
||||
%package -n libMagick++-devel
|
||||
Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel
|
||||
Summary: C++ Interface for ImageMagick - files mandatory for development
|
||||
License: SUSE-ImageMagick
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: ImageMagick-Magick++-devel = %{version}
|
||||
Obsoletes: ImageMagick-Magick++-devel < %{version}
|
||||
|
||||
%package doc
|
||||
Summary: Document Files for ImageMagick Library
|
||||
@ -181,45 +115,21 @@ 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
|
||||
# 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}
|
||||
%define LDFLAGS -L%{_libdir}
|
||||
%define system_ltdl 0
|
||||
%if %system_ltdl
|
||||
cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl
|
||||
mv ltdl/ltdl.c ltdl/ltdl.c.orig
|
||||
sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c
|
||||
%endif
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||
export LDFLAGS="-L%{_libdir}"
|
||||
CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10`
|
||||
# Use mtime of .changes for build time
|
||||
sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh
|
||||
|
||||
autoreconf --force --install -v
|
||||
|
||||
%if %{with xtp}
|
||||
pushd ../xtp-%{xtp_version}
|
||||
autoreconf --force --install
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{suse_version} <= 1030
|
||||
# openmp does not work with perl module
|
||||
OPENMP="--disable-openmp"
|
||||
%endif
|
||||
%configure --with-pic \
|
||||
--enable-shared \
|
||||
--without-frozenpaths \
|
||||
@ -228,17 +138,12 @@ popd
|
||||
--with-threads \
|
||||
--without-perl \
|
||||
--disable-static \
|
||||
--with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
|
||||
--with-djvu=yes \
|
||||
--with-wmf=yes
|
||||
make %{?_smp_mflags} all
|
||||
cd PerlMagick
|
||||
perl Makefile.PL
|
||||
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 %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
|
||||
@ -262,12 +167,6 @@ cd '../Magick++'
|
||||
%{__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 \
|
||||
@ -359,9 +258,6 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
%doc LICENSE
|
||||
%doc PerlMagick/README.txt
|
||||
%doc PerlMagick/demo
|
||||
%if %suse_version < 1140
|
||||
/var/adm/perl-modules/ImageMagick
|
||||
%endif
|
||||
%doc %{_mandir}/man3/Image::Magick.3pm*
|
||||
%{perl_vendorarch}/auto/Image
|
||||
%{perl_vendorarch}/Image
|
||||
@ -387,12 +283,6 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
|
||||
%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,
|
||||
@ -502,4 +392,9 @@ HTML documentation for ImageMagick library and scene examples.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e373873fd9c20eab9116b3000361461830267f290fa5a61ebdd981785fe028cf
|
||||
size 126590
|
||||
Loading…
x
Reference in New Issue
Block a user