Update spec to match Cython has update

This commit is contained in:
pcpa 2016-08-25 18:01:46 -04:00
parent 52f8dc7839
commit ddd84dd86a
2 changed files with 8 additions and 79 deletions

View file

@ -162,29 +162,26 @@ Patch25: %{name}-givaro.patch
# No support for f" notation
Patch26: %{name}-nofstring.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1296652
Patch27: sig_includes.patch
# Add missing include paths
Patch28: %{name}-includes.patch
Patch27: %{name}-includes.patch
# https://trac.sagemath.org/ticket/20926
# #error This file requires compiler and library support for the ISO C++ \
# 2011 standard. This support must be enabled with the -std=c++11 \
# or -std=gnu++11 compiler options.
Patch29: %{name}-gcc6.patch
Patch28: %{name}-gcc6.patch
# Use ipython3 (mostly a rediff from sagemath-6.8 sage/repl)
Patch30: %{name}-ipython3.patch
Patch29: %{name}-ipython3.patch
# Use atlas blas
Patch31: %{name}-atlas.patch
Patch30: %{name}-atlas.patch
# Correct side effect of sagemath-ipython3 patch
Patch32: %{name}-is_in_terminal.patch
Patch31: %{name}-is_in_terminal.patch
# Update for python-flask-0.11.1
Patch33: %{name}-flask.patch
Patch32: %{name}-flask.patch
BuildRequires: 4ti2
BuildRequires: arb-devel
@ -194,7 +191,7 @@ BuildRequires: cddlib-tools
BuildRequires: cliquer-devel
BuildRequires: coin-or-Cbc-devel
BuildRequires: cryptominisat-devel
BuildRequires: Cython
BuildRequires: Cython >= 0.24.1
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
BuildRequires: dvipng
@ -692,13 +689,12 @@ popd
%patch24
%patch25
%patch26
%patch27
%patch28
%patch29
%patch30
%patch31
%patch32
%patch33
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@ -797,7 +793,6 @@ export PYTHONPATH=%{_builddir}%{python_sitearch}:$PYTHONPATH
PATCH=$PWD/build/pkgs/cython/patches/pxi_sys_path.patch
pushd %{_builddir}%{python_sitearch}
patch -p1 < $PATCH
patch -p1 < %{PATCH27}
popd
%endif