diff --git a/scipy.spec b/scipy.spec index f6ee356..4271339 100644 --- a/scipy.spec +++ b/scipy.spec @@ -19,6 +19,7 @@ Url: http://www.scipy.org 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 BuildRequires: numpy, python-devel,f2py BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel @@ -66,6 +67,7 @@ leading scientists and engineers. %prep %setup -q %patch0 -p1 -b .gerqf +%patch1 -p1 cat > site.cfg << EOF [amd] @@ -146,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT - Tue Jul 30 2013 Tomas Tomecek : - Fix rpmlint warnings - License update + - Add patch to use build_dir argument in build_extension * Mon Apr 15 2013 Orion Poplawski - 0.12.0-2 - Add patch to fix segfaul in test of sgeqrf diff --git a/use-argument-build_dir.patch b/use-argument-build_dir.patch new file mode 100644 index 0000000..ff0ca8f --- /dev/null +++ b/use-argument-build_dir.patch @@ -0,0 +1,16 @@ +diff --git a/scipy/weave/build_tools.py b/scipy/weave/build_tools.py +index b990f33..57a5a8e 100644 +--- a/scipy/weave/build_tools.py ++++ b/scipy/weave/build_tools.py +@@ -228,7 +228,7 @@ def build_extension(module_path,compiler_name = '',build_dir = None, + + # configure temp and build directories + temp_dir = configure_temp_dir(temp_dir) +- build_dir = configure_build_dir(module_dir) ++ build_dir = configure_build_dir(build_dir or module_dir) + + # dag. We keep having to add directories to the path to keep + # object files separated from each other. gcc2.x and gcc3.x C++ +-- +1.8.1.2 +