[numpy: 2/2] Merge in F18 FTBFS fix

[Orion Poplawski]

commit 8ab0d5559a03582a1421843e09459e68bb1f19f1
Merge: f27ccf5 a69cb26
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Aug 22 10:15:26 2012 -0600

    Merge in F18 FTBFS fix

 numpy.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc numpy.spec
index 3761c35,b2546a3..bfebabf
--- a/numpy.spec
+++ b/numpy.spec
@@@ -5,11 -5,11 +5,11 @@@
  %endif
  
  #uncomment next line for a release candidate or a beta
 -%global relc %{nil}
 +%global relc b1
  
  Name:           numpy
 -Version:        1.6.2
 -Release:        6%{?dist}
 +Version:        1.7.0
- Release:        0.1.%{relc}%{?dist}
++Release:        0.2.%{relc}%{?dist}
  Epoch:		1
  Summary:        A fast multidimensional array facility for Python
  
@@@ -104,7 -112,13 +104,11 @@@ This package includes a version of f2p
  %patch1 -p1
  %patch2 -p1
  %patch3 -p1
 -%patch4 -p1
 -%patch5 -p1
  
+ # workaround for rhbz#849713
+ # http://mail.scipy.org/pipermail/numpy-discussion/2012-July/063530.html
+ rm numpy/distutils/command/__init__.py && touch numpy/distutils/command/__init__.py
+ 
  # Regenerate Cython c sources
  # This is needed with numpy-1.6.2.tar.gz with python 3.3 to avoid an exception
  # with an import call in the generated .c file in the tarball that uses the
@@@ -282,11 -296,9 +286,14 @@@ rm -rf %{buildroot
  
  
  %changelog
 -* Wed Aug 22 2012 Dan Horák <dan[at]danny.cz> - 1:1.6.2-6
++* Wed Aug 22 2012 Orion Poplawski <orion at nwra.com> - 1:1.7.0-0.2.b1
+ - add workaround for rhbz#849713 (fixes FTBFS)
+ 
 +* Tue Aug 21 2012 Orion Poplawski <orion at cora.nwra.com> - 1:1.7.0-0.1.b1
 +- Update to 1.7.0b1
 +- Rebase python 3.3 patchs to current git master
 +- Drop patches applied upstream
 +
  * Sun Aug  5 2012 David Malcolm <dmalcolm at redhat.com> - 1:1.6.2-5
  - rework patches for 3.3 to more directly reflect upstream's commits
  - re-enable test suite on python 3