Correct side effect of using system mpmath (#974769)

This commit is contained in:
pcpa 2013-08-12 15:36:19 -03:00
parent f796ecaf2b
commit 02277f9220
2 changed files with 34 additions and 3 deletions

View file

@ -60,8 +60,6 @@
%global sagenb_pkg sagenb-0.10.4
%global sagetex_pkg sagetex-2.3.4
%global sagemath_share %{_datadir}/%{name}
%global SAGE_ROOT %{_libdir}/sagemath
%global SAGE_LOCAL %{SAGE_ROOT}/local
%global SAGE_SRC %{SAGE_ROOT}/src
@ -74,7 +72,7 @@ Name: sagemath
Group: Applications/Engineering
Summary: A free open-source mathematics software system
Version: 5.10
Release: 1%{?dist}
Release: 2%{?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
@ -223,6 +221,10 @@ Patch34: %{name}-rh_bz_961372.patch
# sagemath expects python-flask-0.9
Patch35: %{name}-flask.patch
# Side effect of using distro packages
# https://bugzilla.redhat.com/show_bug.cgi?id=974769
Patch36: %{name}-sympy.patch
BuildRequires: 4ti2
BuildRequires: atlas-devel
BuildRequires: cddlib-tools
@ -725,6 +727,11 @@ popd
%patch35 -p1
%endif
%patch36 -p1
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
-i spkg/build/sage-%{version}/sage/env.py
#------------------------------------------------------------------------
# ensure proper/preferred libatlas is in linker path
pushd spkg/build/sage-%{version}
@ -1450,6 +1457,9 @@ exit 0
########################################################################
%changelog
* Mon Aug 12 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.10-2
- Correct side effect of using system mpmath (#974769)
* Mon Aug 5 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.10-1
- Update to sagemath 5.10.