- rel 2

- fix problems with 'imread' and GraphicsMagick >= 1.3.8
  https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-January/014891.html
- S: GraphicsMagick (-libs is not enough for 'imread' to work properly in all cases)

Changed files:
    octave-InitializeMagick.patch -> 1.1
    octave.spec -> 1.120

diff --git a/octave-InitializeMagick.patch b/octave-InitializeMagick.patch
new file mode 100644 (file)
index 0000000..4eb5417
--- /dev/null
+++ b/octave-InitializeMagick.patch
@@ -0,0 +1,28 @@
+--- octave-3.2.4/src/DLD-FUNCTIONS/__magick_read__.cc  2009-08-25 10:26:01.000000000 +0200
++++ octave-3.3.51/src/DLD-FUNCTIONS/__magick_read__.cc 2010-03-03 18:49:00.000000000 +0100
+@@ -27,6 +28,7 @@
+ 
+ #include <cmath>
+ 
++#include "oct-env.h"
+ #include "defun-dld.h"
+ #include "error.h"
+ #include "ov-struct.h"
+@@ -358,6 +384,17 @@
+ 
+ #ifdef HAVE_MAGICK
+ 
++  static bool initialized = false;
++
++  if (! initialized)
++    {
++      std::string program_name = octave_env::get_program_invocation_name ();
++
++      Magick::InitializeMagick (program_name.c_str ());
++
++      initialized = true;
++    }
++
+   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
+       || nargout > 3)
+     {

diff --git a/octave.spec b/octave.spec
index 8f10502a51494b2849ce604156dc7eaedbab7100..47ba5092a7f01461d00b60956beaac6f9b242bb3 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -16,7 +16,7 @@ Summary(sv.UTF-8):    GNU Octave - ett högninvåspråk för numeriska beräkningar
 Summary(zh_CN.UTF-8):  GNU Octave - 用于数字计算的高级语言。
 Name:          octave
 Version:       3.2.4
-Release:       1
+Release:       2
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Math
@@ -28,6 +28,7 @@ Patch1:               %{name}-as_needed.patch
 Patch2:                %{name}-ncurses.patch
 Patch3:                %{name}-no-ftgl.patch
 Patch4:                %{name}-parallel-make.patch
+Patch5:                %{name}-InitializeMagick.patch
 URL:           http://www.octave.org/
 BuildRequires: AMD-devel
 BuildRequires: CAMD-devel
@@ -60,6 +61,7 @@ BuildRequires:        texinfo-texi2dvi
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
 Requires:      gnuplot
+Suggests:      GraphicsMagick
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -281,6 +283,7 @@ Tryb edycji plików Octave dla XEmacsa.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"