rpms/ruby-RMagick/devel ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch, NONE, 1.1 ruby-RMagick.spec, 1.41, 1.42

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7256

Modified Files:
	ruby-RMagick.spec 
Added Files:
	ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch 
Log Message:
add patch for im 660

ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch:
 extconf.rb |    3 ++-
 rmagick.h  |    9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch ---
commit 70dfc29c883588a6bf7d609dd70193f3ce49509d
Author: Omer Bar-or <omer at bar-or.org>
Date:   Mon Feb 15 22:53:16 2010 -0800

    Added check for MagickLibAddendum (replaced MagickLibSubversion).

diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
index 6446d40..78a6260 100644
--- a/ext/RMagick/extconf.rb
+++ b/ext/RMagick/extconf.rb
@@ -204,7 +204,7 @@ end
 
 if RUBY_PLATFORM !~ /mswin|mingw/
 
-  unless have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick", "InitializeMagick", headers) || have_library("Magick++", "InitializeMagick", headers)
+  unless have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick", "InitializeMagick", headers) || have_library("Magick++","InitializeMagick",headers)
     exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
            "Can't find the ImageMagick library or one of the dependent libraries. " +
            "Check the mkmf.log file for more detailed information.\n"
@@ -233,6 +233,7 @@ have_func("snprintf", headers)
    "LevelColorsImageChannel",        # 6.5.6-4
    "LevelizeImageChannel",           # 6.4.2
    "LiquidRescaleImage",             # 6.3.8-2
+   "MagickLibAddendum",              # 6.5.9-1
    "OpaquePaintImageChannel",        # 6.3.7-10
    "QueueAuthenticPixels",           # 6.4.5-6
    "RemapImage",                     # 6.4.4-0
diff --git a/ext/RMagick/rmagick.h b/ext/RMagick/rmagick.h
index e18a678..8aa6f3f 100644
--- a/ext/RMagick/rmagick.h
+++ b/ext/RMagick/rmagick.h
@@ -6,7 +6,7 @@
  * Changes since Nov. 2009 copyright &copy; by Benjamin Thomas and Omer Bar-or
  *
  * @file     rmagick.h
- * @version  $Id: rmagick.h,v 1.281 2009/12/21 10:34:56 baror Exp $
+ * @version  $Id: rmagick.h,v 1.282 2010/02/16 06:50:28 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -162,6 +162,13 @@
 #define DestroyConstitute(void) ConstituteComponentTerminus(void)
 #endif
 
+/** ImageMagick 6.5.9 replaced MagickLibSubversion with
+ * MagickLibAddendum.
+ */
+#if defined(HAVE_MAGICKLIBADDENDUM)
+#define MagickLibSubversion MagickLibAddendum
+#endif
+
 /** IM 6.4.1 replaced AllocateImage with AcquireImage.
  * Both have the same signature.
  */


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ruby-RMagick.spec	7 Mar 2010 07:24:11 -0000	1.41
+++ ruby-RMagick.spec	7 Mar 2010 07:38:20 -0000	1.42
@@ -27,6 +27,8 @@ Group:		Development/Languages
 License:	MIT
 URL:		http://rmagick.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{mainver}%{?betaver:-%betaver}.tar.bz2
+# Patch from git
+Patch0:		ruby-RMagick-2.13.0-IM-MagickLibAddendum.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby
@@ -61,6 +63,7 @@ This package contains documentaton files
 
 %prep
 %setup -q -n %{modname}-%{version}
+%patch0 -p1 -b .im660
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"