rpms/octave-forge/devel octave-forge-20090607-ann-debian-noautoload.patch, NONE, 1.1 octave-forge.spec, 1.87, 1.88

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5208

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-ann-debian-noautoload.patch 
Log Message:
- Adapt two patches from Debian to disable autoloading of 'ann' package:
  http://patch-tracker.debian.org/patch/series/view/octave-ann/1.0.2+dfsg-2/warn-clear-all-at-init.diff
  http://patch-tracker.debian.org/patch/series/view/octave-ann/1.0.2+dfsg-2/autoload-no.diff
  'ann' currently causes crashes even if not being used.
  Should workaround #562276 until upstream fixes the 'ann' package
  properly.


octave-forge-20090607-ann-debian-noautoload.patch:
 DESCRIPTION            |    2 +-
 src/ann/bindings/ann.i |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE octave-forge-20090607-ann-debian-noautoload.patch ---
--- octave-forge-bundle-20090607/main/ann-1.0.2/DESCRIPTION.orig	2010-06-19 13:40:41.684685341 -0400
+++ octave-forge-bundle-20090607/main/ann-1.0.2/DESCRIPTION	2010-06-19 13:40:58.106560731 -0400
@@ -6,7 +6,7 @@
 Title: Approximate Nearest Neighbor Library
 Description: The Octave-forge ANN package wraps the ANN library, which provides data structures and functions for computing exact and approximate nearest neighbors on an arbitrarily high dimensional point set.
 Depends: octave (>= 2.9.12)
-Autoload: yes
+Autoload: no
 SystemRequirements: swig
 License: GPL version 2 or later
 Url: http://octave.sf.net
--- octave-forge-bundle-20090607/main/ann-1.0.2/src/ann/bindings/ann.i.orig	2010-06-19 13:38:49.058684954 -0400
+++ octave-forge-bundle-20090607/main/ann-1.0.2/src/ann/bindings/ann.i	2010-06-19 13:39:39.073935408 -0400
@@ -14,6 +14,12 @@
 #include <ANN/ANNx.h>
 %}
 
+%init %{
+  warning ("You have loaded the ann package.\n"
+           "A call to \"clear -all\" from now on will make Octave crash.\n"
+	   "You have been warned.");
+%}
+
 // take matrix in place of (ANNpointArray pa,int n,int dd)
 %typemap(typecheck,precedence=SWIG_TYPECHECK_INTEGER) (ANNpointArray pa,int n,int dd,bool own_pts) {
    $1 = (*$input).is_matrix_type() ? 1 : 0;


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- octave-forge.spec	8 Sep 2009 01:40:26 -0000	1.87
+++ octave-forge.spec	19 Jun 2010 22:35:39 -0000	1.88
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -22,6 +22,7 @@ Patch1:		octave-forge-20090607-parallel-
 Patch2:		octave-forge-20090607-java-build.patch
 Patch3:		octave-forge-20090607-fixed-build.patch
 Patch4:		octave-forge-20090607-vrml-build.patch
+Patch5:		octave-forge-20090607-ann-debian-noautoload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -169,6 +170,7 @@ done
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -242,6 +244,14 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Sat Jun 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-16
+- Adapt two patches from Debian to disable autoloading of 'ann' package:
+  http://patch-tracker.debian.org/patch/series/view/octave-ann/1.0.2+dfsg-2/warn-clear-all-at-init.diff
+  http://patch-tracker.debian.org/patch/series/view/octave-ann/1.0.2+dfsg-2/autoload-no.diff
+  'ann' currently causes crashes even if not being used.
+  Should workaround #562276 until upstream fixes the 'ann' package
+  properly.
+
 * Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-15
 - Re-enable 'fixed' subpackage, builds now, this closes #510841
 - ftp, graceplot and spanish packages need fixing upstream, leave