rpms/ImageMagick/devel ImageMagick-6.4.9-6-perl-build.patch, NONE, 1.1 ImageMagick-6.4.9-6-undef-warning.patch, NONE, 1.1 ImageMagick.spec, 1.88, 1.89

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6250

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.4.9-6-perl-build.patch 
	ImageMagick-6.4.9-6-undef-warning.patch 
Log Message:
* Fri Mar 13 2009 Hans de Goede <hdegoede at 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


ImageMagick-6.4.9-6-perl-build.patch:

--- NEW FILE ImageMagick-6.4.9-6-perl-build.patch ---
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 at 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',

ImageMagick-6.4.9-6-undef-warning.patch:

--- NEW FILE ImageMagick-6.4.9-6-undef-warning.patch ---
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;


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ImageMagick.spec	9 Mar 2009 11:06:50 -0000	1.88
+++ ImageMagick.spec	13 Mar 2009 10:57:42 -0000	1.89
@@ -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 @@
 %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 @@
 
 
 %changelog
+* Fri Mar 13 2009 Hans de Goede <hdegoede at 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 at redhat.com> 6.4.9.6-1
 - New upstream release 6.4.9-6