commit 31b7828e5c604691fdc844cbb72351178fdca67c
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Jul 1 19:08:34 2018 +0200
- up to 1.14.5
python-numpy-fortran-version.patch | 15 ---------------
python-numpy.spec | 8 +++-----
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/python-numpy.spec b/python-numpy.spec
index 00eab8d..14589ee 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -7,15 +7,14 @@
Summary: Python 2 numerical facilities
Summary(pl.UTF-8): Moduły do obliczeń numerycznych dla języka Python 2
Name: python-%{module}
-Version: 1.12.1
-Release: 3
+Version: 1.14.5
+Release: 1
Epoch: 1
License: BSD
Group: Libraries/Python
#Source0Download: https://github.com/numpy/numpy/releases/
Source0:
https://github.com/numpy/numpy/releases/download/v%{version}/%{module}-%{version}.tar.gz
-# Source0-md5: 2abe6efb8ea0ac1716d1fc5fa90cbacf
-Patch0: %{name}-fortran-version.patch
+# Source0-md5: e3189ee851c3a0e2e6e4c6e80a711ec8
URL: http://sourceforge.net/projects/numpy/
BuildRequires: gcc-fortran
BuildRequires: lapack-devel >= 3.1.1-2
@@ -131,7 +130,6 @@ Generator interfejsów z Fortranu do Pythona 3.
%prep
%setup -q -n %{module}-%{version}
-%patch0 -p1
%build
# numpy.distutils uses CFLAGS/LDFLAGS as its own flags replacements,
diff --git a/python-numpy-fortran-version.patch
b/python-numpy-fortran-version.patch
deleted file mode 100644
index 6b239a4..0000000
--- a/python-numpy-fortran-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- numpy-1.10.1/numpy/distutils/fcompiler/gnu.py.orig 2015-10-13
19:32:27.197631590 +0200
-+++ numpy-1.10.1/numpy/distutils/fcompiler/gnu.py 2015-10-13
19:48:20.714278382 +0200
-@@ -59,10 +59,10 @@
- return ('gfortran', m.group(1))
- else:
- # Output probably from --version, try harder:
-- m = re.search(r'GNU Fortran\s+95.*?([0-9-.]+)', version_string)
-+ m = re.search(r'GNU Fortran\s+95.*?(\d[0-9-.]*)', version_string)
- if m:
- return ('gfortran', m.group(1))
-- m = re.search(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)
-+ m = re.search(r'GNU Fortran.*?\-?(\d[0-9-.]*)', version_string)
- if m:
- v = m.group(1)
- if v.startswith('0') or v.startswith('2') or
v.startswith('3'):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-numpy.git/commitdiff/31b7828e5c604691fdc844cbb72351178fdca67c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
