From 9aec96f36474359f888990a8c8e5f5e6c7a8f3d7 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Fri, 13 Mar 2009 10:57:42 +0000
Subject: [PATCH] - Fix undefined warning in magick-type.h (#489453) - Do not
 link PerlMagick against system ImageMagick, but against the just     build
 one

---
 ImageMagick-6.4.9-6-perl-build.patch    | 12 ++++++++++++
 ImageMagick-6.4.9-6-undef-warning.patch | 12 ++++++++++++
 ImageMagick.spec                        | 11 ++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 ImageMagick-6.4.9-6-perl-build.patch
 create mode 100644 ImageMagick-6.4.9-6-undef-warning.patch

diff --git a/ImageMagick-6.4.9-6-perl-build.patch b/ImageMagick-6.4.9-6-perl-build.patch
new file mode 100644
index 0000000..1ae56f1
--- /dev/null
+++ b/ImageMagick-6.4.9-6-perl-build.patch
@@ -0,0 +1,12 @@
+diff -up ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in
+--- ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~	2009-01-03 16:55:31.000000000 +0100
++++ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in	2009-03-13 11:22:46.000000000 +0100
+@@ -77,7 +77,7 @@ WriteMakefile
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+    # Library specification
+-   'LIBS'	=> [ '-L@MAGICKCORE_PATH@ -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
++   'LIBS'	=> [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
+ 
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',
diff --git a/ImageMagick-6.4.9-6-undef-warning.patch b/ImageMagick-6.4.9-6-undef-warning.patch
new file mode 100644
index 0000000..ba9b3b6
--- /dev/null
+++ b/ImageMagick-6.4.9-6-undef-warning.patch
@@ -0,0 +1,12 @@
+diff -up ImageMagick-6.4.9-6/magick/magick-type.h~ ImageMagick-6.4.9-6/magick/magick-type.h
+--- ImageMagick-6.4.9-6/magick/magick-type.h~	2009-01-15 03:13:58.000000000 +0100
++++ ImageMagick-6.4.9-6/magick/magick-type.h	2009-03-13 10:30:59.000000000 +0100
+@@ -127,7 +127,7 @@ typedef unsigned __int64 MagickSizeType;
+ #define MagickSizeFormat  "%10llu"
+ #endif
+ 
+-#if _MSC_VER == 1200
++#if defined(_MSC_VER) && (_MSC_VER == 1200)
+ typedef MagickOffsetType QuantumAny;
+ #else
+ typedef MagickSizeType QuantumAny;
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 0118173..aff9859 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -3,13 +3,15 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
 Url:            http://www.imagemagick.org/
 Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
 Patch1:         ImageMagick-6.4.0-multilib.patch
+Patch2:         ImageMagick-6.4.9-6-undef-warning.patch
+Patch3:         ImageMagick-6.4.9-6-perl-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -128,6 +130,8 @@ however.
 %prep
 %setup -q -n %{name}-%{VER}-%{Patchlevel}
 %patch1 -p1 -b .multilib
+%patch2 -p1
+%patch3 -p1
 sed -i 's/libltdl.la/libltdl.so/g' configure
 iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp
 touch -r README.txt README.txt.tmp
@@ -301,6 +305,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 13 2009 Hans de Goede <hdegoede@redhat.com> 6.4.9.6-2
+- Fix undefined warning in magick-type.h (#489453)
+- Do not link PerlMagick against system ImageMagick, but against the just
+  build one
+
 * Mon Mar  9 2009 Hans de Goede <hdegoede@redhat.com> 6.4.9.6-1
 - New upstream release 6.4.9-6