From 1938b3201386a8a5c8f2a3888c2189bdebfe2dee Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 4 Sep 2013 17:02:13 -0600
Subject: [PATCH] - Update to 1.8.0b1 - Drop f2py patch applied upstream

---
 .gitignore         |  1 +
 f2py-shebang.patch | 22 ----------------------
 numpy.spec         | 12 +++++++-----
 sources            |  2 +-
 4 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 f2py-shebang.patch

diff --git a/.gitignore b/.gitignore
index 0e6980e..0c0226c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ numpy-1.4.1.tar.gz
 /numpy-1.7.0rc1.tar.gz
 /numpy-1.7.0.tar.gz
 /numpy-1.7.1.tar.gz
+/numpy-1.8.0b1.tar.gz
diff --git a/f2py-shebang.patch b/f2py-shebang.patch
deleted file mode 100644
index 34caebd..0000000
--- a/f2py-shebang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
-index 1fae545..96a047e 100644
---- a/numpy/f2py/setup.py
-+++ b/numpy/f2py/setup.py
-@@ -53,7 +53,7 @@ def configuration(parent_package='',top_path=None):
-             log.info('Creating %s', target)
-             f = open(target,'w')
-             f.write('''\
--#!/usr/bin/env %s
-+#!%s
- # See http://cens.ioc.ee/projects/f2py2e/
- import os, sys
- for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
-@@ -77,7 +77,7 @@ else:
-     sys.stderr.write("Unknown mode: " + repr(mode) + "\\n")
-     sys.exit(1)
- main()
--'''%(os.path.basename(sys.executable)))
-+'''%(sys.executable))
-             f.close()
-         return target
- 
diff --git a/numpy.spec b/numpy.spec
index f0979cf..5ce3be9 100644
--- a/numpy.spec
+++ b/numpy.spec
@@ -5,11 +5,11 @@
 %endif
 
 #uncomment next line for a release candidate or a beta
-#global relc rc1
+%global relc b1
 
 Name:           numpy
-Version:        1.7.1
-Release:        5%{?dist}
+Version:        1.8.0
+Release:        0.1.b1%{?dist}
 Epoch:          1
 Summary:        A fast multidimensional array facility for Python
 
@@ -18,7 +18,6 @@ Group:          Development/Languages
 License:        BSD and Python
 URL:            http://www.numpy.org/
 Source0:        http://downloads.sourceforge.net/numpy/%{name}-%{version}%{?relc}.tar.gz
-Patch1:         f2py-shebang.patch
 
 BuildRequires:  python2-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose
 Requires:       python-nose
@@ -84,7 +83,6 @@ This package includes a version of f2py that works properly with NumPy.
 
 %prep
 %setup -q -n %{name}-%{version}%{?relc}
-%patch1 -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
@@ -244,6 +242,10 @@ popd &> /dev/null
 
 
 %changelog
+* Wed Sep 4 2013 Orion Poplawski <orion@nwra.com> - 1:1.8.0-0.1.b1
+- Update to 1.8.0b1
+- Drop f2py patch applied upstream
+
 * Tue Aug 27 2013 Jon Ciesla <limburgher@gmail.com> - 1:1.7.1-5
 - URL Fix, BZ 1001337
 
diff --git a/sources b/sources
index b38e986..fac659b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ab72b3b83528a7ae79c6df9042d61c6  numpy-1.7.1.tar.gz
+91095ed99d934c16dfc8b6680d268f2c  numpy-1.8.0b1.tar.gz