diff --git a/sagemath.spec b/sagemath.spec index a3c1db2..b0441de 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -179,20 +179,14 @@ Patch27: %{name}-includes.patch # or -std=gnu++11 compiler options. Patch28: %{name}-gcc6.patch -# Use ipython3 (mostly a rediff from sagemath-6.8 sage/repl) -#Patch29: %{name}-ipython3.patch - # Use atlas blas -Patch30: %{name}-atlas.patch - -# Correct side effect of sagemath-ipython3 patch -#Patch31: %{name}-is_in_terminal.patch +Patch29: %{name}-atlas.patch # Update for python-flask-0.11.1 -Patch32: %{name}-flask.patch +Patch30: %{name}-flask.patch # Corrections to build in latest f25 and rawhide -Patch33: %{name}-ftbfs.patch +Patch31: %{name}-ftbfs.patch BuildRequires: 4ti2 BuildRequires: arb-devel @@ -722,11 +716,9 @@ popd %patch26 %patch27 %patch28 -#%#patch29 +%patch29 %patch30 -#%#patch31 -%patch32 -%patch33 +%patch31 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \ -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \