require "lsys.pl";
%rule = (
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/blob.t ImageMagick-5.5.6/PerlMagick/t/blob.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/blob.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/blob.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test image blobs.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/bzlib/read.t ImageMagick-5.5.6/PerlMagick/t/bzlib/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/bzlib/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/bzlib/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading an image which uses BZip compression
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/bzlib/write.t ImageMagick-5.5.6/PerlMagick/t/bzlib/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/bzlib/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/bzlib/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing files using bzlib-based compression
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/cgm/read.t ImageMagick-5.5.6/PerlMagick/t/cgm/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/cgm/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/cgm/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading CGM files
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/filter.t ImageMagick-5.5.6/PerlMagick/t/filter.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/filter.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/filter.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test image filter.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/fpx/read.t ImageMagick-5.5.6/PerlMagick/t/fpx/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/fpx/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/fpx/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading FPX images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/fpx/write.t ImageMagick-5.5.6/PerlMagick/t/fpx/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/fpx/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/fpx/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing FPX images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/getattribute.t ImageMagick-5.5.6/PerlMagick/t/getattribute.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/getattribute.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/getattribute.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test getting attributes.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/hdf/read.t ImageMagick-5.5.6/PerlMagick/t/hdf/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/hdf/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/hdf/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading HDF images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/hdf/write.t ImageMagick-5.5.6/PerlMagick/t/hdf/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/hdf/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/hdf/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing HDF images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/hpgl/read.t ImageMagick-5.5.6/PerlMagick/t/hpgl/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/hpgl/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/hpgl/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test Reading HP GL images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/jbig/read.t ImageMagick-5.5.6/PerlMagick/t/jbig/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/jbig/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/jbig/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test read image method on JBIG image
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/jbig/write.t ImageMagick-5.5.6/PerlMagick/t/jbig/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/jbig/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/jbig/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test write image method on JBIG image
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/jpeg/read.t ImageMagick-5.5.6/PerlMagick/t/jpeg/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/jpeg/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/jpeg/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test read image method on non-interlaced JPEG.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/jpeg/write.t ImageMagick-5.5.6/PerlMagick/t/jpeg/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/jpeg/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/jpeg/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading JPEG images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/montage.t ImageMagick-5.5.6/PerlMagick/t/montage.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/montage.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/montage.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test montage method.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/mpeg/read.t ImageMagick-5.5.6/PerlMagick/t/mpeg/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/mpeg/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/mpeg/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading MPEG files
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/png/read-16.t ImageMagick-5.5.6/PerlMagick/t/png/read-16.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/png/read-16.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/png/read-16.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading PNG images when 16bit support is enabled
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/png/read.t ImageMagick-5.5.6/PerlMagick/t/png/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/png/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/png/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading PNG images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/png/write-16.t ImageMagick-5.5.6/PerlMagick/t/png/write-16.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/png/write-16.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/png/write-16.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing PNG images when 16bit support is enabled
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/png/write.t ImageMagick-5.5.6/PerlMagick/t/png/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/png/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/png/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing PNG images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/ps/read.t ImageMagick-5.5.6/PerlMagick/t/ps/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/ps/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/ps/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test Reading Postscript images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/ps/write.t ImageMagick-5.5.6/PerlMagick/t/ps/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/ps/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/ps/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing Postscript images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/rad/read.t ImageMagick-5.5.6/PerlMagick/t/rad/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/rad/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/rad/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading Radiance file format
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/rad/write.t ImageMagick-5.5.6/PerlMagick/t/rad/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/rad/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/rad/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing Radiance file format
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/read.t ImageMagick-5.5.6/PerlMagick/t/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading formats supported directly by ImageMagick
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/setattribute.t ImageMagick-5.5.6/PerlMagick/t/setattribute.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/setattribute.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/setattribute.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test setting & getting attributes.
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/tiff/read.t ImageMagick-5.5.6/PerlMagick/t/tiff/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/tiff/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/tiff/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading TIFF images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/tiff/write.t ImageMagick-5.5.6/PerlMagick/t/tiff/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/tiff/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/tiff/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing TIFF images
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/ttf/read.t ImageMagick-5.5.6/PerlMagick/t/ttf/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/ttf/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/ttf/read.t Sat Jun 14 17:49:46 2003
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/blob.t ImageMagick-5.5.7/PerlMagick/t/blob.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/blob.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/blob.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test image blobs.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/bzlib/read.t ImageMagick-5.5.7/PerlMagick/t/bzlib/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/bzlib/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/bzlib/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading an image which uses BZip compression\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/bzlib/write.t ImageMagick-5.5.7/PerlMagick/t/bzlib/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/bzlib/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/bzlib/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing files using bzlib-based compression\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/cgm/read.t ImageMagick-5.5.7/PerlMagick/t/cgm/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/cgm/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/cgm/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading CGM files\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/filter.t ImageMagick-5.5.7/PerlMagick/t/filter.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/filter.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/filter.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test image filter.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/fpx/read.t ImageMagick-5.5.7/PerlMagick/t/fpx/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/fpx/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/fpx/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading FPX images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/fpx/write.t ImageMagick-5.5.7/PerlMagick/t/fpx/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/fpx/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/fpx/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing FPX images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/getattribute.t ImageMagick-5.5.7/PerlMagick/t/getattribute.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/getattribute.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/getattribute.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test getting attributes.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/hdf/read.t ImageMagick-5.5.7/PerlMagick/t/hdf/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/hdf/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/hdf/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading HDF images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/hdf/write.t ImageMagick-5.5.7/PerlMagick/t/hdf/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/hdf/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/hdf/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing HDF images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/hpgl/read.t ImageMagick-5.5.7/PerlMagick/t/hpgl/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/hpgl/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/hpgl/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test Reading HP GL images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/jbig/read.t ImageMagick-5.5.7/PerlMagick/t/jbig/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/jbig/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/jbig/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test read image method on JBIG image\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/jbig/write.t ImageMagick-5.5.7/PerlMagick/t/jbig/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/jbig/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/jbig/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test write image method on JBIG image\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/jpeg/read.t ImageMagick-5.5.7/PerlMagick/t/jpeg/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/jpeg/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/jpeg/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test read image method on non-interlaced JPEG.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/jpeg/write.t ImageMagick-5.5.7/PerlMagick/t/jpeg/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/jpeg/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/jpeg/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading JPEG images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/montage.t ImageMagick-5.5.7/PerlMagick/t/montage.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/montage.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/montage.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test montage method.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/mpeg/read.t ImageMagick-5.5.7/PerlMagick/t/mpeg/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/mpeg/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/mpeg/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading MPEG files\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/png/read-16.t ImageMagick-5.5.7/PerlMagick/t/png/read-16.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/png/read-16.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/png/read-16.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading PNG images when 16bit support is enabled\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/png/read.t ImageMagick-5.5.7/PerlMagick/t/png/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/png/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/png/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading PNG images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/png/write-16.t ImageMagick-5.5.7/PerlMagick/t/png/write-16.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/png/write-16.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/png/write-16.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing PNG images when 16bit support is enabled\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/png/write.t ImageMagick-5.5.7/PerlMagick/t/png/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/png/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/png/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing PNG images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/ps/read.t ImageMagick-5.5.7/PerlMagick/t/ps/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/ps/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/ps/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test Reading Postscript images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/ps/write.t ImageMagick-5.5.7/PerlMagick/t/ps/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/ps/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/ps/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing Postscript images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/rad/read.t ImageMagick-5.5.7/PerlMagick/t/rad/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/rad/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/rad/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading Radiance file format\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/rad/write.t ImageMagick-5.5.7/PerlMagick/t/rad/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/rad/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/rad/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing Radiance file format\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/read.t ImageMagick-5.5.7/PerlMagick/t/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading formats supported directly by ImageMagick\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/setattribute.t ImageMagick-5.5.7/PerlMagick/t/setattribute.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/setattribute.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/setattribute.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test setting & getting attributes.\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/tiff/read.t ImageMagick-5.5.7/PerlMagick/t/tiff/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/tiff/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/tiff/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading TIFF images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/tiff/write.t ImageMagick-5.5.7/PerlMagick/t/tiff/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/tiff/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/tiff/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing TIFF images\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/ttf/read.t ImageMagick-5.5.7/PerlMagick/t/ttf/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/ttf/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/ttf/read.t Sat Jun 14 17:49:46 2003
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Test read image method on TrueType font
#
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/wmf/read.t ImageMagick-5.5.6/PerlMagick/t/wmf/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/wmf/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/wmf/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading WMF files
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/write.t ImageMagick-5.5.6/PerlMagick/t/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing formats supported directly by ImageMagick
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/x/read.t ImageMagick-5.5.6/PerlMagick/t/x/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/x/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/x/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test accessing X11 server
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/x/write.t ImageMagick-5.5.6/PerlMagick/t/x/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/x/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/x/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test accessing X11 server
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/xfig/read.t ImageMagick-5.5.6/PerlMagick/t/xfig/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/xfig/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/xfig/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test Reading Xfig files
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/zlib/read.t ImageMagick-5.5.6/PerlMagick/t/zlib/read.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/zlib/read.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/zlib/read.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test reading an image which uses Zip compression
- #
-diff -Naur ImageMagick-5.5.6.orig/PerlMagick/t/zlib/write.t ImageMagick-5.5.6/PerlMagick/t/zlib/write.t
---- ImageMagick-5.5.6.orig/PerlMagick/t/zlib/write.t Sat Jun 14 17:16:03 2003
-+++ ImageMagick-5.5.6/PerlMagick/t/zlib/write.t Sat Jun 14 17:49:46 2003
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Test writing files using zlib-based compression
- #
-diff -Naur ImageMagick-5.5.6.orig/www/perl.html ImageMagick-5.5.6/www/perl.html
---- ImageMagick-5.5.6.orig/www/perl.html Sat Jun 14 17:16:04 2003
-+++ ImageMagick-5.5.6/www/perl.html Sat Jun 14 17:49:46 2003
-@@ -240,10 +240,10 @@
- </dl>
- <blockquote>
- <dl>
-- <pre> #!/usr/local/bin/perl<br> use Image::Magick;<br><br> my($image, $x);<br><br> $image = Image::Magick->new;<br> $x = $image->Read('girl.png', 'logo.png', 'rose.png');<br> warn "$x" if "$x";<br><br> $x = $image->Crop(geometry=>'100x100"+1"00"+1"00');<br> warn "$x" if "$x";<br><br> $x = $image->Write('x.png');<br> warn "$x" if "$x";</pre>
-+ <pre> #!/usr/bin/perl<br> use Image::Magick;<br><br> my($image, $x);<br><br> $image = Image::Magick->new;<br> $x = $image->Read('girl.png', 'logo.png', 'rose.png');<br> warn "$x" if "$x";<br><br> $x = $image->Crop(geometry=>'100x100"+1"00"+1"00');<br> warn "$x" if "$x";<br><br> $x = $image->Write('x.png');<br> warn "$x" if "$x";</pre>
- The script reads three images, crops them, and writes a single image as a
- GIF animation sequence. In many cases you may want to access individual images
--of a sequence. The next example illustrates how this is done: <pre> #!/usr/local/bin/perl<br> use Image::Magick;<br><br> my($image, $p, $q);<br><br> $image = new Image::Magick;<br> $image->Read('x1.png');<br> $image->Read('j*.jpg');<br> $image->Read('k.miff[1, 5, 3]');<br> $image->Contrast();<br> for ($x = 0; $image->[x]; $x++)<br> {<br> $image->[x]->Frame('100x200') if $image->[x]->Get('magick') eq 'GIF';<br> undef $image->[x] if $image->[x]->Get('columns') < 100;<br> }<br> $p = $image->[1];<br> $p->Draw(stroke=>'red', primitive=>'rectangle', points=>20,20 100,100');<br> $q = $p->Montage();<br> undef $image;<br> $q->Write('x.miff');</pre>
-+of a sequence. The next example illustrates how this is done: <pre> #!/usr/bin/perl<br> use Image::Magick;<br><br> my($image, $p, $q);<br><br> $image = new Image::Magick;<br> $image->Read('x1.png');<br> $image->Read('j*.jpg');<br> $image->Read('k.miff[1, 5, 3]');<br> $image->Contrast();<br> for ($x = 0; $image->[x]; $x++)<br> {<br> $image->[x]->Frame('100x200') if $image->[x]->Get('magick') eq 'GIF';<br> undef $image->[x] if $image->[x]->Get('columns') < 100;<br> }<br> $p = $image->[1];<br> $p->Draw(stroke=>'red', primitive=>'rectangle', points=>20,20 100,100');<br> $q = $p->Montage();<br> undef $image;<br> $q->Write('x.miff');</pre>
- Suppose you want to start out with a 100 by 100 pixel white canvas with a
- red pixel in the center. Try <pre> $image = Image::Magick->new;<br> $image->Set(size=>'100x100');<br> $image->ReadImage('xc:white');<br> $image->Set('pixel[49,49]'=>'red');</pre>
- Or suppose you want to convert your color image to grayscale: <pre> $image->Quantize(colorspace=>'gray');</pre>
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/wmf/read.t ImageMagick-5.5.7/PerlMagick/t/wmf/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/wmf/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/wmf/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading WMF files\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/write.t ImageMagick-5.5.7/PerlMagick/t/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing formats supported directly by ImageMagick\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/x/read.t ImageMagick-5.5.7/PerlMagick/t/x/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/x/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/x/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test accessing X11 server\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/x/write.t ImageMagick-5.5.7/PerlMagick/t/x/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/x/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/x/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test accessing X11 server\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/xfig/read.t ImageMagick-5.5.7/PerlMagick/t/xfig/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/xfig/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/xfig/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test Reading Xfig files\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/zlib/read.t ImageMagick-5.5.7/PerlMagick/t/zlib/read.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/zlib/read.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/zlib/read.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test reading an image which uses Zip compression\r
+ #\r
+diff -Naur ImageMagick-5.5.7.orig/PerlMagick/t/zlib/write.t ImageMagick-5.5.7/PerlMagick/t/zlib/write.t
+--- ImageMagick-5.5.7.orig/PerlMagick/t/zlib/write.t Sat Jun 14 17:16:03 2003
++++ ImageMagick-5.5.7/PerlMagick/t/zlib/write.t Sat Jun 14 17:49:46 2003
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl\r
++#!/usr/bin/perl\r
+ #\r
+ # Test writing files using zlib-based compression\r
+ #\r
+--- ImageMagick-5.5.7/www/perl.html.orig 2003-05-12 05:13:02.000000000 +0200
++++ ImageMagick-5.5.7/www/perl.html 2003-07-18 08:37:34.000000000 +0200
+@@ -166,11 +166,11 @@
+ <p>
+
+ <pre>
+- #!/usr/local/bin/perl<br> use Image::Magick;<br><br> my($image, $x);<br><br> $image = Image::Magick->new;<br> $x = $image->Read('girl.png', 'logo.png', 'rose.png');<br> warn "$x" if "$x";<br><br> $x = $image->Crop(geometry=>'100x100"+100"+100');<br> warn "$x" if "$x";<br><br> $x = $image->Write('x.png');<br> warn "$x" if "$x";
++ #!/usr/bin/perl<br> use Image::Magick;<br><br> my($image, $x);<br><br> $image = Image::Magick->new;<br> $x = $image->Read('girl.png', 'logo.png', 'rose.png');<br> warn "$x" if "$x";<br><br> $x = $image->Crop(geometry=>'100x100"+100"+100');<br> warn "$x" if "$x";<br><br> $x = $image->Write('x.png');<br> warn "$x" if "$x";
+ </pre>
+ The script reads three images, crops them, and writes a single image as a GIF animation sequence. In many cases you may want to access individual images of a sequence. The next example illustrates how this is done:
+ <pre>
+- #!/usr/local/bin/perl<br> use Image::Magick;<br><br> my($image, $p, $q);<br><br> $image = new Image::Magick;<br> $image->Read('x1.png');<br> $image->Read('j*.jpg');<br> $image->Read('k.miff[1, 5, 3]');<br> $image->Contrast();<br> for ($x = 0; $image->[x]; $x++)<br> {<br> $image->[x]->Frame('100x200') if $image->[x]->Get('magick') eq 'GIF';<br> undef $image->[x] if $image->[x]->Get('columns') < 100;<br> }<br> $p = $image->[1];<br> $p->Draw(stroke=>'red', primitive=>'rectangle', points=>20,20 100,100');<br> $q = $p->Montage();<br> undef $image;<br> $q->Write('x.miff');
++ #!/usr/bin/perl<br> use Image::Magick;<br><br> my($image, $p, $q);<br><br> $image = new Image::Magick;<br> $image->Read('x1.png');<br> $image->Read('j*.jpg');<br> $image->Read('k.miff[1, 5, 3]');<br> $image->Contrast();<br> for ($x = 0; $image->[x]; $x++)<br> {<br> $image->[x]->Frame('100x200') if $image->[x]->Get('magick') eq 'GIF';<br> undef $image->[x] if $image->[x]->Get('columns') < 100;<br> }<br> $p = $image->[1];<br> $p->Draw(stroke=>'red', primitive=>'rectangle', points=>20,20 100,100');<br> $q = $p->Montage();<br> undef $image;<br> $q->Write('x.miff');
+ </pre>
+ Suppose you want to start out with a 100 by 100 pixel white canvas with a red pixel in the center. Try
+ <pre>
# _without_cxx - without Magick++
#
%include /usr/lib/rpm/macros.perl
-%define ver 5.5.6
-#%%define pver 3
+%define ver 5.5.7
+%define pver 10
%define QuantumDepth 16
-%define iver %{ver}-Q%{QuantumDepth}
Summary: Image display, conversion, and manipulation under X
Summary(de): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
Summary(es): Exhibidor, convertidor y manipulador de imágenes bajo X
Summary(uk): ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä X Windows
Name: ImageMagick
Version: %{ver}%{?pver:.%{pver}}
-Release: 3
+Release: 1
Epoch: 1
License: Freeware
Group: X11/Applications/Graphics
Source0: http://dl.sourceforge.net/imagemagick/%{name}-%{ver}%{?pver:-%{pver}}.tar.bz2
-# Source0-md5: eac3971f0704059dcf2f7a5737b7daa8
+# Source0-md5: ae9e708a6f5dc8b77220b00a0f2ae65a
Patch0: %{name}-libpath.patch
Patch1: %{name}-perlpaths.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-system-libltdl.patch
-Patch4: %{name}-dps.patch
-Patch5: %{name}-tmp_fix.patch
URL: http://www.imagemagick.org/
BuildRequires: XFree86-DPS-devel
BuildRequires: XFree86-devel
%{!?_without_jasper:BuildRequires: jasper-devel}
BuildRequires: jbigkit-devel
BuildRequires: lcms-devel
+BuildRequires: libexif-devel
%{!?_without_fpx:BuildRequires: libfpx-devel >= 1.2.0.4-3}
BuildRequires: libjpeg-devel
BuildRequires: libltdl-devel
# we don't want "-s" here, because it would be added to `Magick*-config --ldflags`
%define rpmldflags %{nil}
+%define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
%description
ImageMagick is an image display, conversion, and manipulation tool. It
Requires: bzip2-devel
Requires: freetype-devel
Requires: lcms-devel
+Requires: libexif-devel
Requires: libltdl-devel
Requires: zlib-devel
Group: X11/Development/Libraries
Requires: %{name}-c++ = %{epoch}:%{version}
Requires: %{name}-devel = %{epoch}:%{version}
+Requires: libstdc++-devel
%description c++-devel
ImageMagick-c++-devel contains header files you'll need to develop
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
rm -f missing
%{__aclocal} -I /usr/share/libtool/libltdl
%{__autoconf}
%{__automake}
-CPPFLAGS="-I/usr/include/g++"
%configure \
- CPPFLAGS="$CPPFLAGS" \
--enable-fast-install \
--enable-lzw \
--enable-shared \
--with-x
%{__make}
-%{!?_without_cxx:%{__make} -C Magick++}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- pkgdocdir=%{_defaultdocdir}/%{name}-devel-%{version}/
+ pkgdocdir=%{_defaultdocdir}/%{name}-devel-%{version}
install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
-rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-%{iver}/modules/coders/*.a
+rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
%clean
rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%doc Copyright.txt
-%attr(755,root,root) %{_libdir}/libMagick-%{iver}.so.*.*
+%attr(755,root,root) %{_libdir}/libMagick.so.*.*.*
%files
%defattr(644,root,root,755)
-%dir %{_libdir}/ImageMagick-%{iver}
-%{_libdir}/ImageMagick-%{iver}/*.mgk
-%dir %{_libdir}/ImageMagick-%{iver}/modules
-%dir %{_libdir}/ImageMagick-%{iver}/modules/coders
+%dir %{_libdir}/ImageMagick-%{ver}
+%{_libdir}/ImageMagick-%{ver}/*.mgk
+%dir %{modulesdir}
+%{_libdir}/ImageMagick-%{ver}/*.mgk
+%dir %{modulesdir}/coders
+%{modulesdir}/coders/modules.mgk
+%dir %{modulesdir}/filters
# ========= coders without additional deps
-%{_libdir}/ImageMagick-%{iver}/modules/coders/art.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/art.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/avi.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/avi.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/avs.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/avs.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/bmp.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/bmp.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/caption.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/caption.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/cmyk.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/cmyk.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/cut.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/cut.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/dcm.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dcm.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/dib.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dib.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/dpx.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dpx.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/ept.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ept.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/fax.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fax.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/fits.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fits.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/gif.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gif.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/gradient.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gradient.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/gray.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gray.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/histogram.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/histogram.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/html.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/html.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/icon.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/icon.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/label.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/label.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/locale.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/locale.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/logo.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/logo.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/map.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/map.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mat.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mat.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/matte.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/matte.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/meta.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/meta.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mono.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mono.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mpc.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpc.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mpeg.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpeg.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mtv.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mtv.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mvg.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mvg.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/null.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/null.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/otb.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/otb.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/palm.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/palm.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pcd.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcd.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pcl.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcl.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pcx.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcx.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pdb.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pdb.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pict.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pict.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pix.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pix.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/plasma.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/plasma.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pnm.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pnm.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/preview.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/preview.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/psd.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/psd.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/ps.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pwp.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pwp.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/rgb.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rgb.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/rla.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rla.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/rle.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rle.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/sct.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sct.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/sfw.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sfw.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/sgi.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sgi.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/stegano.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/stegano.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/sun.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sun.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/tga.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tga.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/tile.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tile.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/tim.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tim.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/ttf.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ttf.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/txt.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/txt.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/uil.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/uil.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/uyvy.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/uyvy.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/vicar.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/vicar.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/vid.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/vid.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/viff.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/viff.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/wbmp.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wbmp.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/wpg.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wpg.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/xbm.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xbm.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/xcf.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xcf.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/xc.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xc.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/xpm.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xpm.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/x.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/x.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/xwd.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xwd.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/yuv.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/yuv.so
-
-%{_libdir}/ImageMagick-%{iver}/modules/coders/*.mgk
+%attr(755,root,root) %{modulesdir}/coders/art.so
+%{modulesdir}/coders/art.la
+%attr(755,root,root) %{modulesdir}/coders/avi.so
+%{modulesdir}/coders/avi.la
+%attr(755,root,root) %{modulesdir}/coders/avs.so
+%{modulesdir}/coders/avs.la
+%attr(755,root,root) %{modulesdir}/coders/bmp.so
+%{modulesdir}/coders/bmp.la
+%attr(755,root,root) %{modulesdir}/coders/caption.so
+%{modulesdir}/coders/caption.la
+%attr(755,root,root) %{modulesdir}/coders/cmyk.so
+%{modulesdir}/coders/cmyk.la
+%attr(755,root,root) %{modulesdir}/coders/cut.so
+%{modulesdir}/coders/cut.la
+%attr(755,root,root) %{modulesdir}/coders/dcm.so
+%{modulesdir}/coders/dcm.la
+%attr(755,root,root) %{modulesdir}/coders/dib.so
+%{modulesdir}/coders/dib.la
+%attr(755,root,root) %{modulesdir}/coders/dpx.so
+%{modulesdir}/coders/dpx.la
+%attr(755,root,root) %{modulesdir}/coders/ept.so
+%{modulesdir}/coders/ept.la
+%attr(755,root,root) %{modulesdir}/coders/fax.so
+%{modulesdir}/coders/fax.la
+%attr(755,root,root) %{modulesdir}/coders/fits.so
+%{modulesdir}/coders/fits.la
+%attr(755,root,root) %{modulesdir}/coders/gif.so
+%{modulesdir}/coders/gif.la
+%attr(755,root,root) %{modulesdir}/coders/gradient.so
+%{modulesdir}/coders/gradient.la
+%attr(755,root,root) %{modulesdir}/coders/gray.so
+%{modulesdir}/coders/gray.la
+%attr(755,root,root) %{modulesdir}/coders/histogram.so
+%{modulesdir}/coders/histogram.la
+%attr(755,root,root) %{modulesdir}/coders/html.so
+%{modulesdir}/coders/html.la
+%attr(755,root,root) %{modulesdir}/coders/icon.so
+%{modulesdir}/coders/icon.la
+%attr(755,root,root) %{modulesdir}/coders/label.so
+%{modulesdir}/coders/label.la
+%attr(755,root,root) %{modulesdir}/coders/magick.so
+%{modulesdir}/coders/magick.la
+%attr(755,root,root) %{modulesdir}/coders/map.so
+%{modulesdir}/coders/map.la
+%attr(755,root,root) %{modulesdir}/coders/mat.so
+%{modulesdir}/coders/mat.la
+%attr(755,root,root) %{modulesdir}/coders/matte.so
+%{modulesdir}/coders/matte.la
+%attr(755,root,root) %{modulesdir}/coders/meta.so
+%{modulesdir}/coders/meta.la
+%attr(755,root,root) %{modulesdir}/coders/mono.so
+%{modulesdir}/coders/mono.la
+%attr(755,root,root) %{modulesdir}/coders/mpc.so
+%{modulesdir}/coders/mpc.la
+%attr(755,root,root) %{modulesdir}/coders/mpeg.so
+%{modulesdir}/coders/mpeg.la
+%attr(755,root,root) %{modulesdir}/coders/mtv.so
+%{modulesdir}/coders/mtv.la
+%attr(755,root,root) %{modulesdir}/coders/mvg.so
+%{modulesdir}/coders/mvg.la
+%attr(755,root,root) %{modulesdir}/coders/null.so
+%{modulesdir}/coders/null.la
+%attr(755,root,root) %{modulesdir}/coders/otb.so
+%{modulesdir}/coders/otb.la
+%attr(755,root,root) %{modulesdir}/coders/palm.so
+%{modulesdir}/coders/palm.la
+%attr(755,root,root) %{modulesdir}/coders/pattern.so
+%{modulesdir}/coders/pattern.la
+%attr(755,root,root) %{modulesdir}/coders/pcd.so
+%{modulesdir}/coders/pcd.la
+%attr(755,root,root) %{modulesdir}/coders/pcl.so
+%{modulesdir}/coders/pcl.la
+%attr(755,root,root) %{modulesdir}/coders/pcx.so
+%{modulesdir}/coders/pcx.la
+%attr(755,root,root) %{modulesdir}/coders/pdb.so
+%{modulesdir}/coders/pdb.la
+%attr(755,root,root) %{modulesdir}/coders/pict.so
+%{modulesdir}/coders/pict.la
+%attr(755,root,root) %{modulesdir}/coders/pix.so
+%{modulesdir}/coders/pix.la
+%attr(755,root,root) %{modulesdir}/coders/plasma.so
+%{modulesdir}/coders/plasma.la
+%attr(755,root,root) %{modulesdir}/coders/pnm.so
+%{modulesdir}/coders/pnm.la
+%attr(755,root,root) %{modulesdir}/coders/preview.so
+%{modulesdir}/coders/preview.la
+%attr(755,root,root) %{modulesdir}/coders/psd.so
+%{modulesdir}/coders/psd.la
+%attr(755,root,root) %{modulesdir}/coders/ps.so
+%{modulesdir}/coders/ps.la
+%attr(755,root,root) %{modulesdir}/coders/pwp.so
+%{modulesdir}/coders/pwp.la
+%attr(755,root,root) %{modulesdir}/coders/rgb.so
+%{modulesdir}/coders/rgb.la
+%attr(755,root,root) %{modulesdir}/coders/rla.so
+%{modulesdir}/coders/rla.la
+%attr(755,root,root) %{modulesdir}/coders/rle.so
+%{modulesdir}/coders/rle.la
+%attr(755,root,root) %{modulesdir}/coders/sct.so
+%{modulesdir}/coders/sct.la
+%attr(755,root,root) %{modulesdir}/coders/sfw.so
+%{modulesdir}/coders/sfw.la
+%attr(755,root,root) %{modulesdir}/coders/sgi.so
+%{modulesdir}/coders/sgi.la
+%attr(755,root,root) %{modulesdir}/coders/stegano.so
+%{modulesdir}/coders/stegano.la
+%attr(755,root,root) %{modulesdir}/coders/sun.so
+%{modulesdir}/coders/sun.la
+%attr(755,root,root) %{modulesdir}/coders/tga.so
+%{modulesdir}/coders/tga.la
+%attr(755,root,root) %{modulesdir}/coders/tile.so
+%{modulesdir}/coders/tile.la
+%attr(755,root,root) %{modulesdir}/coders/tim.so
+%{modulesdir}/coders/tim.la
+%attr(755,root,root) %{modulesdir}/coders/ttf.so
+%{modulesdir}/coders/ttf.la
+%attr(755,root,root) %{modulesdir}/coders/txt.so
+%{modulesdir}/coders/txt.la
+%attr(755,root,root) %{modulesdir}/coders/uil.so
+%{modulesdir}/coders/uil.la
+%attr(755,root,root) %{modulesdir}/coders/uyvy.so
+%{modulesdir}/coders/uyvy.la
+%attr(755,root,root) %{modulesdir}/coders/vicar.so
+%{modulesdir}/coders/vicar.la
+%attr(755,root,root) %{modulesdir}/coders/vid.so
+%{modulesdir}/coders/vid.la
+%attr(755,root,root) %{modulesdir}/coders/viff.so
+%{modulesdir}/coders/viff.la
+%attr(755,root,root) %{modulesdir}/coders/wbmp.so
+%{modulesdir}/coders/wbmp.la
+%attr(755,root,root) %{modulesdir}/coders/wpg.so
+%{modulesdir}/coders/wpg.la
+%attr(755,root,root) %{modulesdir}/coders/xbm.so
+%{modulesdir}/coders/xbm.la
+%attr(755,root,root) %{modulesdir}/coders/xcf.so
+%{modulesdir}/coders/xcf.la
+%attr(755,root,root) %{modulesdir}/coders/xc.so
+%{modulesdir}/coders/xc.la
+%attr(755,root,root) %{modulesdir}/coders/xpm.so
+%{modulesdir}/coders/xpm.la
+%attr(755,root,root) %{modulesdir}/coders/x.so
+%{modulesdir}/coders/x.la
+%attr(755,root,root) %{modulesdir}/coders/xwd.so
+%{modulesdir}/coders/xwd.la
+%attr(755,root,root) %{modulesdir}/coders/yuv.so
+%{modulesdir}/coders/yuv.la
+
+%attr(755,root,root) %{modulesdir}/filters/analyze.so
+%{modulesdir}/filters/analyze.la
%attr(755,root,root) %{_bindir}/animate
%attr(755,root,root) %{_bindir}/composite
%files coder-dps
%defattr(644,root,root,755)
# R: XFree86-DPS (libdps.so)
-%{_libdir}/ImageMagick-%{iver}/modules/coders/dps.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dps.so
+%attr(755,root,root) %{modulesdir}/coders/dps.so
+%{modulesdir}/coders/dps.la
%if %{?_without_fpx:0}%{!?_without_fpx:1}
%files coder-fpx
%defattr(644,root,root,755)
# R: fpx
-%{_libdir}/ImageMagick-%{iver}/modules/coders/fpx.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fpx.so
+%attr(755,root,root) %{modulesdir}/coders/fpx.so
+%{modulesdir}/coders/fpx.la
%endif
%files coder-jbig
%defattr(644,root,root,755)
# R: jbigkit (libjbig.so)
-%{_libdir}/ImageMagick-%{iver}/modules/coders/jbig.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jbig.so
+%attr(755,root,root) %{modulesdir}/coders/jbig.so
+%{modulesdir}/coders/jbig.la
%files coder-jpeg
%defattr(644,root,root,755)
# R: libjpeg
-%{_libdir}/ImageMagick-%{iver}/modules/coders/jpeg.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jpeg.so
+%attr(755,root,root) %{modulesdir}/coders/jpeg.so
+%{modulesdir}/coders/jpeg.la
%if %{?_without_jasper:0}%{!?_without_jasper:1}
%files coder-jpeg2
%defattr(644,root,root,755)
# R: jasper, libjpeg
-%{_libdir}/ImageMagick-%{iver}/modules/coders/jp2.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jp2.so
+%attr(755,root,root) %{modulesdir}/coders/jp2.so
+%{modulesdir}/coders/jp2.la
%endif
%files coder-miff
%defattr(644,root,root,755)
# R: libjpeg, zlib, libbz2
-%{_libdir}/ImageMagick-%{iver}/modules/coders/miff.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/miff.so
+%attr(755,root,root) %{modulesdir}/coders/miff.so
+%{modulesdir}/coders/miff.la
%files coder-mpr
%defattr(644,root,root,755)
# R: libxml2
-%{_libdir}/ImageMagick-%{iver}/modules/coders/mpr.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpr.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/msl.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/msl.so
+%attr(755,root,root) %{modulesdir}/coders/mpr.so
+%{modulesdir}/coders/mpr.la
+%attr(755,root,root) %{modulesdir}/coders/msl.so
+%{modulesdir}/coders/msl.la
%files coder-pdf
%defattr(644,root,root,755)
# R: libtiff, libjpeg
-%{_libdir}/ImageMagick-%{iver}/modules/coders/pdf.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pdf.so
+%attr(755,root,root) %{modulesdir}/coders/pdf.so
+%{modulesdir}/coders/pdf.la
%files coder-png
%defattr(644,root,root,755)
# R: libpng
-%{_libdir}/ImageMagick-%{iver}/modules/coders/png.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/png.so
+%attr(755,root,root) %{modulesdir}/coders/png.so
+%{modulesdir}/coders/png.la
%files coder-ps2
%defattr(644,root,root,755)
# R: libtiff, libjpeg
-%{_libdir}/ImageMagick-%{iver}/modules/coders/ps2.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps2.so
-%{_libdir}/ImageMagick-%{iver}/modules/coders/ps3.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps3.so
+%attr(755,root,root) %{modulesdir}/coders/ps2.so
+%{modulesdir}/coders/ps2.la
+%attr(755,root,root) %{modulesdir}/coders/ps3.so
+%{modulesdir}/coders/ps3.la
%files coder-svg
%defattr(644,root,root,755)
# R: libxml2
-%{_libdir}/ImageMagick-%{iver}/modules/coders/svg.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/svg.so
+%attr(755,root,root) %{modulesdir}/coders/svg.so
+%{modulesdir}/coders/svg.la
%files coder-tiff
%defattr(644,root,root,755)
# R: libtiff, libjpeg
-%{_libdir}/ImageMagick-%{iver}/modules/coders/tiff.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tiff.so
+%attr(755,root,root) %{modulesdir}/coders/tiff.so
+%{modulesdir}/coders/tiff.la
%files coder-url
%defattr(644,root,root,755)
# R: libxml2
-%{_libdir}/ImageMagick-%{iver}/modules/coders/url.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/url.so
+%attr(755,root,root) %{modulesdir}/coders/url.so
+%{modulesdir}/coders/url.la
%files coder-wmf
%defattr(644,root,root,755)
# R: libwmf, expat, libjpeg, libpng
-%{_libdir}/ImageMagick-%{iver}/modules/coders/wmf.la
-%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wmf.so
+%attr(755,root,root) %{modulesdir}/coders/wmf.so
+%{modulesdir}/coders/wmf.la
%files devel
%defattr(644,root,root,755)
#%%doc README.txt
%doc %{_defaultdocdir}/%{name}-devel-%{version}
-
%attr(755,root,root) %{_bindir}/Magick-config
%attr(755,root,root) %{_libdir}/libMagick.so
%{_libdir}/libMagick.la
%{_includedir}/magick
-
+%{_pkgconfigdir}/ImageMagick.pc
%{_mandir}/man[45]/*
%{_mandir}/man1/Magick-config.1*
%if %{?_without_cxx:0}%{!?_without_cxx:1}
%files c++
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libMagick++-%{iver}.so.*.*
+%attr(755,root,root) %{_libdir}/libMagick++.so.*.*.*
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libMagick++.so
%{_includedir}/Magick++
%{_includedir}/Magick++.h
+%{_pkgconfigdir}/ImageMagick++.pc
%{_mandir}/man1/Magick++-config.1*
%files c++-static