[packages/python-numpy] - updated to 1.8.2 - updated fortran-version patch

qboosh qboosh at pld-linux.org
Sun Nov 16 14:10:57 CET 2014


commit 7afea327100a59e14f8ba01c8479ac2825eeb80b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 16 14:11:30 2014 +0100

    - updated to 1.8.2
    - updated fortran-version patch

 python-numpy-fortran-version.patch | 17 ++++++++---------
 python-numpy.spec                  | 10 ++++++----
 2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/python-numpy.spec b/python-numpy.spec
index ece12f6..e31948a 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -7,13 +7,13 @@
 Summary:	Python 2 numerical facilities
 Summary(pl.UTF-8):	Moduły do obliczeń numerycznych dla języka Python 2
 Name:		python-%{module}
-Version:	1.7.2
-Release:	2
+Version:	1.8.2
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		Libraries/Python
 Source0:	http://downloads.sourceforge.net/numpy/%{module}-%{version}.tar.gz
-# Source0-md5:	6eba32e71bd30cf70b9ea2ef28519d9a
+# Source0-md5:	dd8eece8f6fda3a13836de4adbafb0cb
 Patch0:		%{name}-fortran-version.patch
 URL:		http://sourceforge.net/projects/numpy/
 %if %{with python2}
@@ -285,7 +285,7 @@ rm -rf $RPM_BUILD_ROOT
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
 %{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/%{module}/doc
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/%{module}/*/{benchmarks,tests,docs}
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/%{module}/*/{tests,docs}
 # already in f2py package
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/%{module}/f2py/f2py.1
 
@@ -343,6 +343,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/%{module}/linalg
 %{py_sitedir}/%{module}/linalg/*.py
 %{py_sitedir}/%{module}/linalg/*.py[co]
+%attr(755,root,root) %{py_sitedir}/%{module}/linalg/_umath_linalg.so
 %attr(755,root,root) %{py_sitedir}/%{module}/linalg/lapack_lite.so
 %dir %{py_sitedir}/%{module}/ma
 %{py_sitedir}/%{module}/ma/*.py
@@ -432,6 +433,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitedir}/%{module}/linalg
 %{py3_sitedir}/%{module}/linalg/*.py
 %{py3_sitedir}/%{module}/linalg/__pycache__
+%attr(755,root,root) %{py3_sitedir}/%{module}/linalg/_umath_linalg.cpython-3*.so
 %attr(755,root,root) %{py3_sitedir}/%{module}/linalg/lapack_lite.cpython-3*.so
 %dir %{py3_sitedir}/%{module}/ma
 %{py3_sitedir}/%{module}/ma/*.py
diff --git a/python-numpy-fortran-version.patch b/python-numpy-fortran-version.patch
index 843bb03..e683848 100644
--- a/python-numpy-fortran-version.patch
+++ b/python-numpy-fortran-version.patch
@@ -1,16 +1,15 @@
-diff -dur numpy-1.7.1.orig/numpy/distutils/fcompiler/gnu.py numpy-1.7.1/numpy/distutils/fcompiler/gnu.py
---- numpy-1.7.1.orig/numpy/distutils/fcompiler/gnu.py	2013-04-07 07:04:05.000000000 +0200
-+++ numpy-1.7.1/numpy/distutils/fcompiler/gnu.py	2013-07-18 09:20:06.000000000 +0200
-@@ -36,10 +36,10 @@
-         m = re.match(r'GNU Fortran', version_string)
+--- 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.match(r'GNU Fortran\s+95.*?([0-9-.]+)', version_string)
-+        m = re.match(r'GNU Fortran\s+95.*?(\d[0-9-.]*)', version_string)
+-        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.match(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)
-+        m = re.match(r'GNU Fortran.*?\-?(\d[0-9-.]*)', version_string)
+-        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/7afea327100a59e14f8ba01c8479ac2825eeb80b



More information about the pld-cvs-commit mailing list