[scipy/arpack: 7/7] Merge in master changes

[Orion Poplawski]

commit 5fca90952c61aae825e8f3dd4048b0c6c15908c2
Merge: 2556dd6 73b7541
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Aug 8 16:21:16 2013 -0600

    Merge in master changes

 scipy.spec                   |   32 ++++++++++++++++++++++----------
 use-argument-build_dir.patch |   16 ++++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)
---
diff --cc scipy.spec
index 44c59bf,326e999..7f478a4
--- a/scipy.spec
+++ b/scipy.spec
@@@ -16,8 -19,7 +19,9 @@@ Url: http://www.scipy.or
  Source0: http://downloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
  # Fix definition on gerqf that caused test segfault
  Patch0:  scipy-gerqf.patch
+ Patch1:  use-argument-build_dir.patch
 +# Use system arpack
- Patch1:  scipy-arpack.patch
++Patch2:  scipy-arpack.patch
  
  BuildRequires: numpy, python-devel,f2py
  BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel
@@@ -66,9 -67,7 +70,10 @@@ leading scientists and engineers
  %prep
  %setup -q
  %patch0 -p1 -b .gerqf
+ %patch1 -p1
 +%define _default_patch_fuzz 2
- %patch1 -p1 -b .arpack
++%patch2 -p1 -b .arpack
 +rm -r scipy/sparse/linalg/eigen/arpack/ARPACK
  cat > site.cfg << EOF
  
  [amd]