diff --git a/ImageMagick-6.6.1-0.tar.bz2 b/ImageMagick-6.6.1-0.tar.bz2 deleted file mode 100644 index 4c9e48a..0000000 --- a/ImageMagick-6.6.1-0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:069cb672ac0ffa0e46876c80ec746a8e5e30975b28c4af2bca0e3739f84a00d2 -size 8760944 diff --git a/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch b/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch deleted file mode 100644 index 081136a..0000000 --- a/ImageMagick-6.6.1.0-grayscale-tiff-jpeg.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: ImageMagick-6.6.1-0/coders/tiff.c -=================================================================== ---- ImageMagick-6.6.1-0.orig/coders/tiff.c -+++ ImageMagick-6.6.1-0/coders/tiff.c -@@ -2668,22 +2668,19 @@ static MagickBooleanType WriteTIFFImage( - image->endian=MSBEndian; - if ((int) (*(char *) &lsb_first) != 0) - image->endian=LSBEndian; -- if ((compress_tag == COMPRESSION_JPEG) && (photometric != PHOTOMETRIC_RGB)) -- compress_tag=COMPRESSION_NONE; -+ if ((compress_tag == COMPRESSION_CCITTFAX3) && -+ (photometric != PHOTOMETRIC_MINISWHITE)) -+ { -+ compress_tag=COMPRESSION_NONE; -+ endian=FILLORDER_MSB2LSB; -+ } - else -- if ((compress_tag == COMPRESSION_CCITTFAX3) && -- (photometric != PHOTOMETRIC_MINISWHITE)) -- { -- compress_tag=COMPRESSION_NONE; -- endian=FILLORDER_MSB2LSB; -- } -- else -- if ((compress_tag == COMPRESSION_CCITTFAX4) && -- (photometric != PHOTOMETRIC_MINISWHITE)) -- { -- compress_tag=COMPRESSION_NONE; -- endian=FILLORDER_MSB2LSB; -- } -+ if ((compress_tag == COMPRESSION_CCITTFAX4) && -+ (photometric != PHOTOMETRIC_MINISWHITE)) -+ { -+ compress_tag=COMPRESSION_NONE; -+ endian=FILLORDER_MSB2LSB; -+ } - (void) TIFFSetField(tiff,TIFFTAG_COMPRESSION,compress_tag); - (void) TIFFSetField(tiff,TIFFTAG_FILLORDER,endian); - (void) TIFFSetField(tiff,TIFFTAG_BITSPERSAMPLE,quantum_info->depth); diff --git a/ImageMagick-6.6.1.0-units.patch b/ImageMagick-6.6.1.0-units.patch deleted file mode 100644 index cb8cc11..0000000 --- a/ImageMagick-6.6.1.0-units.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: ImageMagick-6.6.1-0/magick/image.c -=================================================================== ---- ImageMagick-6.6.1-0.orig/magick/image.c -+++ ImageMagick-6.6.1-0/magick/image.c -@@ -3959,6 +3959,9 @@ MagickExport MagickBooleanType SyncImage - MagickStatusType - flags; - -+ ResolutionType -+ units; -+ - /* - Sync image options. - */ -@@ -4150,16 +4153,18 @@ MagickExport MagickBooleanType SyncImage - option); - option=GetImageOption(image_info,"units"); - if (option != (const char *) NULL) -- image->units=(ResolutionType) ParseMagickOption(MagickResolutionOptions, -+ units=(ResolutionType) ParseMagickOption(MagickResolutionOptions, - MagickFalse,option); -- if (image_info->units != UndefinedResolution) -+ else -+ units = image_info->units; -+ if (units != UndefinedResolution) - { -- if (image->units != image_info->units) -+ if (image->units != units) - switch (image->units) - { - case PixelsPerInchResolution: - { -- if (image_info->units == PixelsPerCentimeterResolution) -+ if (units == PixelsPerCentimeterResolution) - { - image->x_resolution/=2.54; - image->y_resolution/=2.54; -@@ -4168,7 +4173,7 @@ MagickExport MagickBooleanType SyncImage - } - case PixelsPerCentimeterResolution: - { -- if (image_info->units == PixelsPerInchResolution) -+ if (units == PixelsPerInchResolution) - { - image->x_resolution*=2.54; - image->y_resolution*=2.54; -@@ -4178,7 +4183,7 @@ MagickExport MagickBooleanType SyncImage - default: - break; - } -- image->units=image_info->units; -+ image->units=units; - } - option=GetImageOption(image_info,"white-point"); - if (option != (const char *) NULL) diff --git a/ImageMagick-6.6.3-1.tar.bz2 b/ImageMagick-6.6.3-1.tar.bz2 new file mode 100644 index 0000000..d9fc511 --- /dev/null +++ b/ImageMagick-6.6.3-1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09ccde39d7e6ddbc8ab8b6d9043c3e6023a11b1a076b7365e92910883bb7a78e +size 8845790 diff --git a/ImageMagick-6.6.1.0-doc.patch b/ImageMagick-6.6.3.1-doc.patch similarity index 100% rename from ImageMagick-6.6.1.0-doc.patch rename to ImageMagick-6.6.3.1-doc.patch diff --git a/ImageMagick-6.6.1.0-examples.patch b/ImageMagick-6.6.3.1-examples.patch similarity index 100% rename from ImageMagick-6.6.1.0-examples.patch rename to ImageMagick-6.6.3.1-examples.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index 085391f..28802d8 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 29 13:08:43 CEST 2010 - pgajdos@suse.cz + +- updated to 6.6.3-1: + * obsoletes units.patch + * obsoletes grayscale-tiff-jpeg.patch + ------------------------------------------------------------------- Tue Jun 22 17:37:54 CEST 2010 - pgajdos@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index d919f41..20aa55c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -29,10 +29,10 @@ Provides: imagemag License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.1.0 -Release: 4 -%define source_version 6.6.1-0 -%define libver 3 +Version: 6.6.3.1 +Release: 3 +%define source_version 6.6.3-1 +%define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 @@ -42,8 +42,6 @@ Source2: xtp-%{xtp_version}.tar.bz2 Source3: baselibs.conf Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch -Patch3: ImageMagick-%{version}-units.patch -Patch4: ImageMagick-%{version}-grayscale-tiff-jpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -121,8 +119,6 @@ rm -rf xtp-%{xtp_version} %setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 %build %define system_ltdl 0