rpms/ImageMagick/devel .cvsignore, 1.24, 1.25 ImageMagick-6.4.0-multilib.patch, 1.2, 1.3 ImageMagick.spec, 1.87, 1.88 sources, 1.24, 1.25 ImageMagick-6.3.8-invalid-gerror-use.patch, 1.2, NONE

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	.cvsignore ImageMagick-6.4.0-multilib.patch ImageMagick.spec 
	sources 
Removed Files:
	ImageMagick-6.3.8-invalid-gerror-use.patch 
Log Message:
* Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 6.4.9.6-1
- New upstream release 6.4.9-6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	27 Dec 2008 13:59:23 -0000	1.24
+++ .cvsignore	9 Mar 2009 11:06:50 -0000	1.25
@@ -1 +1 @@
-ImageMagick-6.4.5.5-clean.tar.bz2
+ImageMagick-6.4.9-6.tar.bz2

ImageMagick-6.4.0-multilib.patch:

Index: ImageMagick-6.4.0-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick-6.4.0-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImageMagick-6.4.0-multilib.patch	14 Nov 2008 14:54:41 -0000	1.2
+++ ImageMagick-6.4.0-multilib.patch	9 Mar 2009 11:06:50 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.5/Magick++/bin/Magick++-config.in
---- ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib	2008-02-17 19:10:46.000000000 +0100
-+++ ImageMagick-6.4.5/Magick++/bin/Magick++-config.in	2008-11-14 15:19:15.000000000 +0100
+diff -up ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in
+--- ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib	2008-12-08 20:00:35.000000000 +0100
++++ ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in	2009-02-24 10:55:05.000000000 +0100
 @@ -7,8 +7,6 @@
  
  prefix=@prefix@
@@ -30,14 +30,14 @@
 +      pkg-config --libs Magick++
        ;;
      --libs)
--      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore"
+-      echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@"
 +      pkg-config --libs Magick++
        ;;
      *)
        echo "${usage}" 1>&2
-diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/magick/Magick-config.in
---- ImageMagick-6.4.5/magick/Magick-config.in.multilib	2008-04-28 00:35:32.000000000 +0200
-+++ ImageMagick-6.4.5/magick/Magick-config.in	2008-11-14 15:19:15.000000000 +0100
+diff -up ImageMagick-6.4.9-6/magick/Magick-config.in.multilib ImageMagick-6.4.9-6/magick/Magick-config.in
+--- ImageMagick-6.4.9-6/magick/Magick-config.in.multilib	2008-12-08 20:00:35.000000000 +0100
++++ ImageMagick-6.4.9-6/magick/Magick-config.in	2009-02-24 10:57:33.000000000 +0100
 @@ -6,8 +6,6 @@
  
  prefix=@prefix@
@@ -67,14 +67,14 @@
 +      pkg-config --libs MagickCore
        ;;
      --libs)
--      echo "-L${libdir} -lMagickCore"
+-      echo "-L${libdir} @MAGICK_LIBS@"
 +      pkg-config --libs MagickCore
        ;;
      *)
        echo "${usage}" 1>&2
-diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4.5/magick/MagickCore-config.in
---- ImageMagick-6.4.5/magick/MagickCore-config.in.multilib	2008-08-16 19:34:36.000000000 +0200
-+++ ImageMagick-6.4.5/magick/MagickCore-config.in	2008-11-14 15:42:54.000000000 +0100
+diff -up ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib ImageMagick-6.4.9-6/magick/MagickCore-config.in
+--- ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib	2008-12-08 20:00:35.000000000 +0100
++++ ImageMagick-6.4.9-6/magick/MagickCore-config.in	2009-02-24 11:02:23.000000000 +0100
 @@ -6,8 +6,6 @@
  
  prefix=@prefix@
@@ -104,7 +104,7 @@
 +      pkg-config --libs MagickCore
        ;;
      --libs)
--      echo "-L${libdir} -lMagickCore"
+-      echo "-L${libdir} @MAGICK_LIBS@"
 -      ;;
 -    --coder-path)
 -      echo "@CODER_PATH@"
@@ -115,9 +115,9 @@
        ;;
      *)
        echo "${usage}" 1>&2
-diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/wand/MagickWand-config.in
---- ImageMagick-6.4.5/wand/MagickWand-config.in.multilib	2008-02-05 19:50:44.000000000 +0100
-+++ ImageMagick-6.4.5/wand/MagickWand-config.in	2008-11-14 15:19:15.000000000 +0100
+diff -up ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib ImageMagick-6.4.9-6/wand/MagickWand-config.in
+--- ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib	2008-12-08 20:00:35.000000000 +0100
++++ ImageMagick-6.4.9-6/wand/MagickWand-config.in	2009-02-24 11:01:09.000000000 +0100
 @@ -6,8 +6,6 @@
  
  prefix=@prefix@
@@ -147,14 +147,14 @@
 +      pkg-config --libs MagickWand
        ;;
      --libs)
--      echo "-L${libdir} -lMagickWand -lMagickCore"
+-      echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
 +      pkg-config --libs MagickWand
        ;;
      *)
        echo "${usage}" 1>&2
-diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/Wand-config.in
---- ImageMagick-6.4.5/wand/Wand-config.in.multilib	2008-02-05 19:50:44.000000000 +0100
-+++ ImageMagick-6.4.5/wand/Wand-config.in	2008-11-14 15:19:15.000000000 +0100
+diff -up ImageMagick-6.4.9-6/wand/Wand-config.in.multilib ImageMagick-6.4.9-6/wand/Wand-config.in
+--- ImageMagick-6.4.9-6/wand/Wand-config.in.multilib	2008-12-08 20:00:35.000000000 +0100
++++ ImageMagick-6.4.9-6/wand/Wand-config.in	2009-02-24 10:54:27.000000000 +0100
 @@ -6,8 +6,6 @@
  
  prefix=@prefix@
@@ -184,7 +184,7 @@
 +      pkg-config --libs MagickWand
        ;;
      --libs)
--      echo "-L${libdir} -lMagickWand -lMagickCore"
+-      echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
 +      pkg-config --libs MagickWand
        ;;
      *)


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ImageMagick.spec	23 Feb 2009 21:26:13 -0000	1.87
+++ ImageMagick.spec	9 Mar 2009 11:06:50 -0000	1.88
@@ -1,20 +1,15 @@
-%define VER 6.4.5
-%define Patchlevel 5
+%define VER 6.4.9
+%define Patchlevel 6
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        9%{?dist}
+Release:        1%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
 Url:            http://www.imagemagick.org/
-# This is: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
-# With the 2 included copies of the non free ArtBrush font removed:
-# PerlMagick/t/ttf/input.ttf
-# PerlMagick/demo/Generic.ttf
-Source0:        %{name}-%{version}-clean.tar.bz2
+Source0:        ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
 Patch1:         ImageMagick-6.4.0-multilib.patch
-Patch2:         ImageMagick-6.3.8-invalid-gerror-use.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -131,9 +126,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{VER}
+%setup -q -n %{name}-%{VER}-%{Patchlevel}
 %patch1 -p1 -b .multilib
-%patch2 -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
@@ -307,6 +301,9 @@
 
 
 %changelog
+* Mon Mar  9 2009 Hans de Goede <hdegoede at redhat.com> 6.4.9.6-1
+- New upstream release 6.4.9-6
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.4.5.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Dec 2008 13:59:23 -0000	1.24
+++ sources	9 Mar 2009 11:06:50 -0000	1.25
@@ -1 +1 @@
-f1f95352f69d7c02ed19b0d3e0c806fb  ImageMagick-6.4.5.5-clean.tar.bz2
+d65a4cd3cf103d49085a55c90c871854  ImageMagick-6.4.9-6.tar.bz2


--- ImageMagick-6.3.8-invalid-gerror-use.patch DELETED ---