rpms/octave-forge/devel octave-forge-20080429-ImageMagick.patch, NONE, 1.1 octave-forge.spec, 1.58, 1.59

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11838

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20080429-ImageMagick.patch 
Log Message:
Add patch for new ImageMagick.

octave-forge-20080429-ImageMagick.patch:

--- NEW FILE octave-forge-20080429-ImageMagick.patch ---
--- octave-forge-bundle-20080429/main/image-1.0.6/src/__magick_read__.cc.old	2008-02-19 08:48:25.000000000 -0600
+++ octave-forge-bundle-20080429/main/image-1.0.6/src/__magick_read__.cc	2008-02-19 08:49:15.000000000 -0600
@@ -1,5 +1,5 @@
 #include <octave/oct.h>
-#include <Magick++.h>
+#include <ImageMagick/Magick++.h>
 #include <iostream>
 using namespace std;
 using namespace Magick;
--- octave-forge-bundle-20080429/main/image-1.0.6/src/Makefile.old	2008-02-19 08:57:20.000000000 -0600
+++ octave-forge-bundle-20080429/main/image-1.0.6/src/Makefile	2008-02-19 08:57:03.000000000 -0600
@@ -30,6 +30,6 @@
 	$(MKOCTFILE) $< -lpng
 
 __magick_read__.oct: __magick_read__.cc
-	$(MKOCTFILE) $< `Magick++-config --cppflags` -lMagick++ -lMagick
+	$(MKOCTFILE) $< `Magick++-config --cppflags` -lMagick++ -lMagickCore
 
 clean: ; -$(RM) *.o octave-core core *.oct *~


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- octave-forge.spec	1 May 2008 17:50:13 -0000	1.58
+++ octave-forge.spec	2 May 2008 14:59:09 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080429
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -18,6 +18,7 @@
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
 Patch0:         %{name}-20080429-gcc43.patch
+Patch1:         %{name}-20080429-ImageMagick.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -138,6 +139,7 @@
 done
 
 %patch0 -p1
+%patch1 -p1
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -211,6 +213,9 @@
 
 
 %changelog
+* Fri May  2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-6
+- Add patch for new ImageMagick.
+
 * Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-5
 - Modify the patch to fix compile flags in a subpackage.