rpms/scipy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 0.14

Browse Source 
- Do not use system python-six (bug #1046817)
This commit is contained in:
Orion Poplawski 2014-05-06 08:54:45 -06:00
parent 17734bb24b
commit b51885ba54
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,3 +12,5 @@ scipy-0.7.2.tar.gz
/scipy-0.13.1.tar.gz /scipy-0.13.1.tar.gz
/scipy-0.13.2.tar.gz /scipy-0.13.2.tar.gz
/scipy-0.13.3.tar.gz /scipy-0.13.3.tar.gz
/scipy-0.14.0b1.tar.gz
/scipy-0.14.0.tar.gz

17
scipy.spec
View File

@ -6,12 +6,12 @@
} }
# Set to pre-release version suffix if building pre-release, else %{nil} # Set to pre-release version suffix if building pre-release, else %{nil}
#%%define rcver rc1 %global rcver %{nil}
Summary: Scientific Tools for Python Summary: Scientific Tools for Python
Name: scipy Name: scipy
Version: 0.13.3 Version: 0.14.0
Release: 2%{?dist} Release: 1%{?dist}
Group: Development/Libraries Group: Development/Libraries
# BSD -- whole package except: # BSD -- whole package except:
@ -22,18 +22,15 @@ Url: http://www.scipy.org
Source0: http://downloads.sourceforge.net/scipy/%{name}-%{version}%{?rcver}.tar.gz Source0: http://downloads.sourceforge.net/scipy/%{name}-%{version}%{?rcver}.tar.gz
BuildRequires: numpy, python2-devel,f2py BuildRequires: numpy, python2-devel,f2py
BuildRequires: python-six
BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel
BuildRequires: atlas-devel BuildRequires: atlas-devel
BuildRequires: gcc-gfortran, swig BuildRequires: gcc-gfortran, swig
Requires: numpy, python,f2py Requires: numpy, python,f2py
Requires: python-six
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-numpy, python3-devel, python3-f2py BuildRequires: python3-numpy, python3-devel, python3-f2py
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: python3-nose BuildRequires: python3-nose
BuildRequires: python3-six
%endif %endif
%description %description
@ -54,7 +51,6 @@ Summary: Scientific Tools for Python
Group: Development/Libraries Group: Development/Libraries
License: BSD and LGPLv2+ License: BSD and LGPLv2+
Requires: python3-numpy, python3-f2py Requires: python3-numpy, python3-f2py
Requires: python3-six
%description -n python3-scipy %description -n python3-scipy
Scipy is open-source software for mathematics, science, and Scipy is open-source software for mathematics, science, and
engineering. The core library is NumPy which provides convenient and engineering. The core library is NumPy which provides convenient and
@ -70,9 +66,6 @@ leading scientists and engineers.
%prep %prep
%setup -q -n %{name}-%{version}%{?rcver} %setup -q -n %{name}-%{version}%{?rcver}
# Bundled libs
rm scipy/lib/six.py
find -name \*.py | xargs sed -i -e 's/scipy\.lib\.six/six/'
cat > site.cfg << EOF cat > site.cfg << EOF
[amd] [amd]
@ -147,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
%endif # with_python3 %endif # with_python3
%changelog %changelog
* Tue May 6 2014 Orion Poplawski <orion@cora.nwra.com> - 0.14-1
- Update to 0.14
- Do not use system python-six (bug #1046817)
* Thu Feb 20 2014 Thomas Spura <tomspur@fedoraproject.org> - 0.13.3-2 * Thu Feb 20 2014 Thomas Spura <tomspur@fedoraproject.org> - 0.13.3-2
- use python2 macros everywhere (Requested by Han Boetes) - use python2 macros everywhere (Requested by Han Boetes)

2
sources
View File

@ -1 +1 @@
0547c1f8e8afad4009cc9b5ef17a2d4d scipy-0.13.3.tar.gz d7c7f4ccf8b07b08d6fe49d5cd51f85d scipy-0.14.0.tar.gz