diff --git a/.gitignore b/.gitignore index 763e635..090db42 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ numpy-1.4.1.tar.gz /numpy-1.13.2.tar.gz /numpy-1.13.3.tar.gz /numpy-html-1.13.0.zip +/numpy-1.14.0rc1.tar.gz diff --git a/numpy.spec b/numpy.spec index d29bf6e..43ee57b 100644 --- a/numpy.spec +++ b/numpy.spec @@ -5,13 +5,13 @@ %endif #uncomment next line for a release candidate or a beta -#%%global relc rc2 +%global relc rc1 %global modname numpy Name: numpy -Version: 1.13.3 -Release: 5%{?dist} +Version: 1.14.0 +Release: 0.%relc%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -19,7 +19,7 @@ Group: Development/Languages # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python License: BSD and Python URL: http://www.numpy.org/ -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}%relc.tar.gz Source1: https://docs.scipy.org/doc/numpy/numpy-html-1.13.0.zip BuildRequires: python2-devel lapack-devel python2-setuptools gcc-gfortran python2-nose @@ -227,7 +227,7 @@ pushd %{buildroot}%{_bindir} &> /dev/null # symlink for anyone who was using f2py.numpy ln -s f2py f2py.numpy popd &> /dev/null -install -D -p -m 0644 doc/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py.1 +#install -D -p -m 0644 docs/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py.1 #symlink for includes, BZ 185079 mkdir -p %{buildroot}/usr/include @@ -276,10 +276,11 @@ popd &> /dev/null %{python2_sitearch}/%{name}/polynomial %{python2_sitearch}/%{name}-*.egg-info %{_includedir}/numpy +%exclude %{python2_sitearch}/%{name}/LICENSE.txt %files -n python2-numpy-f2py -%doc doc/f2py/*.txt -%{_mandir}/man*/* +%doc docs/f2py/*.html +#%{_mandir}/man*/* %{_bindir}/f2py %{_bindir}/f2py2 %{_bindir}/f2py.numpy @@ -309,6 +310,7 @@ popd &> /dev/null %{python3_sitearch}/%{name}/matrixlib %{python3_sitearch}/%{name}/polynomial %{python3_sitearch}/%{name}-*.egg-info +%exclude %{python3_sitearch}/%{name}/LICENSE.txt %files -n python3-numpy-f2py %{_bindir}/f2py3 @@ -321,6 +323,9 @@ popd &> /dev/null %changelog +* Wed Dec 13 2017 Gwyn Ciesla - 1:1.14.0-0.rc1 +- 1.14.0 rc1 + * Mon Dec 11 2017 Iryna Shcherbina - 1:1.13.3-5 - Fix ambiguous Python 2 dependency declarations (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 3685259..065ce37 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (numpy-1.13.3.tar.gz) = 1ff454514528edf9666a7b9e4fd990f3cf10410d3c8d9e395cbd5ba7765d55939406bf15a036de5fe6df833013a29f4db13d2df2081349bd9bd743052fbf2f11 +SHA512 (numpy-1.14.0rc1.tar.gz) = 9d7df68b89b66e0aa6736ce1659435ec231552616f9df059603b092e8d755708c334902d711b83922728786c9b74006192fd8a5f2a4a1b16916b3474563156ab SHA512 (numpy-html-1.13.0.zip) = 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542