Update to sagemath 7.5.1

This commit is contained in:
pcpa 2017-04-06 08:02:52 -04:00
parent ac3aa7f6b7
commit 056e08d023
24 changed files with 481 additions and 439 deletions

View file

@ -34,12 +34,12 @@
%global SAGE_TIMEOUT_LONG 180
%global conway_polynomials_pkg conway_polynomials-0.4
%global cysignals_pkg cysignals-1.1.1
%global cysignals_pkg cysignals-1.3.2
%global elliptic_curves_pkg elliptic_curves-0.8
%global flintqs_pkg flintqs-1.0
%global graphs_pkg graphs-20151224
%global graphs_pkg graphs-20161026
%if %{with bundled_ipython}
%global ipython_pkg ipython-5.0.0
%global ipython_pkg ipython-5.1.0
%endif
%if %{with bundled_pari}
%global pari_pkg pari-2.8.0.alpha
@ -51,6 +51,7 @@
%global rubiks_pkg rubiks-20070912
%global sagenb_pkg sagenb-0.13
%global sagetex_pkg sagetex-3.0
%global Sphinx_pkg Sphinx-1.4.4
%global SAGE_ROOT %{_libdir}/sagemath
%global SAGE_LOCAL %{SAGE_ROOT}/local
@ -64,8 +65,8 @@
Name: sagemath
Group: Applications/Engineering
Summary: A free open-source mathematics software system
Version: 7.4
Release: 4%{?dist}
Version: 7.5.1
Release: 1%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name
# before files with that license
@ -185,8 +186,8 @@ Patch29: %{name}-atlas.patch
# Update for python-flask-0.11.1
Patch30: %{name}-flask.patch
# Corrections to build in latest f25 and rawhide
Patch31: %{name}-ftbfs.patch
# Minor adaptation to latest singular
Patch31: %{name}-singular.patch
BuildRequires: 4ti2
BuildRequires: arb-devel
@ -244,7 +245,9 @@ BuildRequires: nauty
BuildRequires: ntl-devel
BuildRequires: numpy
BuildRequires: palp
%if %{without bundled_pari}
%if %{with bundled_pari}
BuildConflicts: pari-devel
%else
BuildRequires: pari-devel
BuildRequires: pari-gp
%endif
@ -266,6 +269,7 @@ BuildRequires: python-networkx
BuildRequires: python-pexpect
%endif
BuildRequires: python-pkgconfig
BuildRequires: python-psutil
BuildRequires: python-sphinx
BuildRequires: python-six
BuildRequires: python-twisted
@ -599,6 +603,11 @@ computations, and plots from the Sage mathematics software suite
pushd build/pkgs/cysignals
tar jxf ../../../upstream/%{cysignals_pkg}.tar.bz2
mv %{cysignals_pkg} src
if [ %{__isa_bits} = "64" ]; then
for file in $(find . -name cysignals-CSI); do
sed -i "s/'lib'/'%{_lib}'/" $file
done
fi
popd
pushd build/pkgs/conway_polynomials
@ -679,6 +688,20 @@ pushd build/pkgs/sagetex
mv %{sagetex_pkg} src
popd
%if %{with docs}
%if %{with sphinx_hack}
pushd build/pkgs/sphinx
tar zxf ../../../upstream/%{Sphinx_pkg}.tar.gz
mv %{Sphinx_pkg} src
pushd src
for diff in `ls ../patches/*.patch`; do
patch -p1 < $diff
done
popd
popd
%endif
%endif
%patch1
%patch2
%patch3
@ -714,6 +737,7 @@ popd
%patch24
%patch25
%patch26
%patch27
%patch28
%patch29
@ -1186,9 +1210,11 @@ pushd src/doc
export PYTHONPATH=$SAGE_SETUP:%{buildroot}%{python_sitearch}:$SAGE_PYTHONPATH:$SAGE_DOC
%if %{with sphinx_hack}
cp -far %{python_sitelib}/sphinx %{buildroot}%{python_sitearch}
sed -i "s|\(source.startswith('>>>')\)|\1 or source.startswith('sage: ')|" \
%{buildroot}%{python_sitearch}/sphinx/highlighting.py
pushd ../../build/pkgs/sphinx/src
%__python2 setup.py build
%__python2 setup.py install --root %{buildroot} --install-purelib=%{python_sitearch}
rm -f %{buildroot}%{_bindir}/sphinx*
popd
%endif
# there we go
@ -1198,7 +1224,7 @@ pushd src/doc
# python -m sage_setup.docbuild
# FIXME there is a 'ja' translation, but adding it to $LANGUAGES
# does not get documentation built
LANGUAGES="ca de en fr hu it pt ru tr" \
SAGE_NUM_THREADS=2 LANGUAGES="ca de en fr hu it pt ru tr" \
%__python2 -m docbuild --no-pdf-links -k all html
rm -f %{buildroot}%{SAGE_SRC}/doc
ln -sf %{SAGE_DOC} %{buildroot}%{SAGE_SRC}/doc
@ -1221,7 +1247,8 @@ sed -i 's|%{buildroot}||g' $SAGE_DOC/test.log
%endif
%if %{with sphinx_hack}
rm -fr %{buildroot}%{python_sitearch}/sphinx
rm -fr %{buildroot}%{python_sitearch}/sphinx \
%{buildroot}%{python_sitearch}/Sphinx*
%endif
# More wrong buildroot references
@ -1233,6 +1260,8 @@ perl -pi -e 's|%{buildroot}||g;' \
# Script was used to build documentation
perl -pi -e 's|%{buildroot}||g;s|^##||g;' %{buildroot}%{_bindir}/sage
perl -pi -e 's|%{buildroot}||;' \
%{buildroot}%{python_sitearch}/cysignals/__init__.pxd
#------------------------------------------------------------------------
# Fix links
@ -1282,6 +1311,7 @@ chmod -x %{buildroot}%{SAGE_DOC}/en/prep/media/Rplot001.png
find %{buildroot}%{SAGE_DOC} -name .buildinfo -exec rm {} \;
rm -fr %{buildroot}%{SAGE_DOC}/output/inventory
find %{buildroot}%{SAGE_DOC} -type d -name _sources | xargs rm -fr
find %{buildroot}%{SAGE_DOC} -name 'core.*' -exec rm {} \;
%endif
# remove .po files
@ -1662,6 +1692,9 @@ exit 0
########################################################################
%changelog
* Thu Apr 6 20176 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 7.5.1-1
- Update to sagemath 7.5.1
* Fri Mar 3 2017 Jerry James <loganjerry@gmail.com> - 7.4-4
- Rebuild for ppl 1.2