diff --git a/.gitignore b/.gitignore index 7162833..31d5384 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ numpy-1.4.1.tar.gz /numpy-1.10.0b1.tar.gz /numpy-1.10.0.tar.gz /numpy-1.10.1.tar.gz +/numpy-1.10.2rc1.tar.gz diff --git a/numpy-1.10.1-remove-opt-flags.patch b/numpy-1.10.1-remove-opt-flags.patch deleted file mode 100644 index bd38944..0000000 --- a/numpy-1.10.1-remove-opt-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- numpy-1.10.1/numpy/distutils/fcompiler/gnu.py 2015-10-14 21:43:39.834732663 +0200 -+++ numpy-1.10.1/numpy/distutils/fcompiler/gnu.py.orig 2015-10-14 21:42:31.346540506 +0200 -@@ -218,7 +218,7 @@ - opt = ['-O2 -march=core2 -mtune=generic -mfpmath=sse -msse2 ' - '-mincoming-stack-boundary=2'] - else: -- opt = ['-O2'] -+ opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2'] - else: - opt = ['-O2'] - diff --git a/numpy.spec b/numpy.spec index fa213e7..33ca6bb 100644 --- a/numpy.spec +++ b/numpy.spec @@ -5,14 +5,13 @@ %endif #uncomment next line for a release candidate or a beta -#%%global relc %%{nil} -#%%global relc b1 +%global relc rc1 %global modname numpy Name: numpy -Version: 1.10.1 -Release: 6%{?relc}%{?dist} +Version: 1.10.2 +Release: 0.1%{?relc}%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -21,7 +20,6 @@ Group: Development/Languages License: BSD and Python URL: http://www.numpy.org/ Source0: http://downloads.sourceforge.net/numpy/%{name}-%{version}%{?relc}.tar.gz -Patch0: numpy-1.10.1-remove-opt-flags.patch BuildRequires: python2-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose BuildRequires: Cython @@ -112,7 +110,6 @@ This package includes a version of f2py that works properly with NumPy. %prep %setup -q -n %{name}-%{version}%{?relc} -%patch0 -R -p1 # workaround for rhbz#849713 # http://mail.scipy.org/pipermail/numpy-discussion/2012-July/063530.html @@ -255,6 +252,10 @@ popd &> /dev/null %changelog +* Fri Nov 13 2015 Orion Poplawski - 1:1.10.2-0.1.rc1 +- Update to 1.10.2rc1 +- Drop opt-flags patch applied upstream + * Fri Nov 13 2015 Kalev Lember - 1:1.10.1-6 - Add provides to satisfy numpy%%{_isa} requires in other packages diff --git a/sources b/sources index 9fe9b00..a8792cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fed2b50906bc19018cec5fa26168aa5 numpy-1.10.1.tar.gz +4e3ccca26fd959c2c71f68d8e279db07 numpy-1.10.2rc1.tar.gz