commit 1bb69c2733f66d0731c00ecae2f68f99a83af8d1
Author: Jakub Bogusz <[email protected]>
Date: Tue Oct 13 20:30:36 2015 +0200
- updated to 1.10.1
- upaded fortran-version patch
python-numpy-fortran-version.patch | 30 +++++++++++++++---------------
python-numpy.spec | 12 ++++--------
2 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/python-numpy.spec b/python-numpy.spec
index 8612579..9e38df1 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -7,17 +7,17 @@
Summary: Python 2 numerical facilities
Summary(pl.UTF-8): Moduły do obliczeń numerycznych dla języka Python 2
Name: python-%{module}
-Version: 1.9.2
-Release: 4
+Version: 1.10.1
+Release: 1
Epoch: 1
License: BSD
Group: Libraries/Python
Source0:
http://downloads.sourceforge.net/numpy/%{module}-%{version}.tar.gz
-# Source0-md5: a1ed53432dbcd256398898d35bc8e645
+# Source0-md5: 3fed2b50906bc19018cec5fa26168aa5
Patch0: %{name}-fortran-version.patch
URL: http://sourceforge.net/projects/numpy/
%if %{with python2}
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.6
%pyrequires_eq python-libs
%endif
%if %{with python3}
@@ -201,7 +201,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py_sitedir}/%{module}/lib
%{py_sitedir}/%{module}/lib/*.py
%{py_sitedir}/%{module}/lib/*.py[co]
-%attr(755,root,root) %{py_sitedir}/%{module}/lib/_compiled_base.so
%dir %{py_sitedir}/%{module}/linalg
%{py_sitedir}/%{module}/linalg/*.py
%{py_sitedir}/%{module}/linalg/*.py[co]
@@ -226,9 +225,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py_sitedir}/%{module}/tests
%{py_sitedir}/%{module}/tests/*.py
%{py_sitedir}/%{module}/tests/*.py[co]
-%if "%{py_ver}" > "2.4"
%{py_sitedir}/numpy-%{version}-py*.egg-info
-%endif
%files devel
%defattr(644,root,root,755)
@@ -274,7 +271,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/%{module}/lib
%{py3_sitedir}/%{module}/lib/*.py
%{py3_sitedir}/%{module}/lib/__pycache__
-%attr(755,root,root) %{py3_sitedir}/%{module}/lib/_compiled_base.cpython-3*.so
%dir %{py3_sitedir}/%{module}/linalg
%{py3_sitedir}/%{module}/linalg/*.py
%{py3_sitedir}/%{module}/linalg/__pycache__
diff --git a/python-numpy-fortran-version.patch
b/python-numpy-fortran-version.patch
index e683848..6b239a4 100644
--- a/python-numpy-fortran-version.patch
+++ b/python-numpy-fortran-version.patch
@@ -1,15 +1,15 @@
---- numpy-1.9.1/numpy/distutils/fcompiler/gnu.py.orig 2014-11-16
11:33:49.843409705 +0100
-+++ numpy-1.9.1/numpy/distutils/fcompiler/gnu.py 2014-11-16
11:41:09.486724575 +0100
-@@ -38,10 +38,10 @@
- m = re.search(r'GNU Fortran', version_string)
- if not m:
- return None
-- 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'):
+--- 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/1bb69c2733f66d0731c00ecae2f68f99a83af8d1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
