mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 6.2
This commit is contained in:
pcpa
parent
52d9e04212
commit
fa9204b9a9
25 changed files with 9618 additions and 7756 deletions
131
sagemath.spec
131
sagemath.spec
|
|
@ -1,34 +1,11 @@
|
|||
# of a system package
|
||||
%global __provides_exclude_from .*/site-packages/.*\\.so
|
||||
|
||||
# for quicker test with packages not yet in fedora
|
||||
%global packager_debug 0
|
||||
|
||||
# not functional due to missing jar dependencies
|
||||
%global with_sage3d 0
|
||||
|
||||
# use an workaround to match upstream sagemath patched sphinx
|
||||
%global with_sphinx_hack 1
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=909510
|
||||
%global have_lrcalc 1
|
||||
|
||||
# Cbc dependency under review is as follow:
|
||||
# first need coin-or-CoinUtils
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894585
|
||||
# then coin-or-Osi (that requires coin-or-CoinUtils)
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894586
|
||||
# then coin-or-Clp (that requires coin-or-Osi)
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894587
|
||||
# then coin-or-Cgl (that requires coin-or-Clp)
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894588
|
||||
# and finally coin-or-Cbc (that requires coin-or-Cgl)
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894597
|
||||
# other coin-or-* packages under review are not required by sagemath
|
||||
# but are required to have the "basic" set of coin-or packages
|
||||
%global have_coin_or_Cbc %{packager_debug}
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=914936
|
||||
%ifarch x86_64
|
||||
%global have_fes 1
|
||||
%else
|
||||
|
|
@ -61,8 +38,8 @@
|
|||
Name: sagemath
|
||||
Group: Applications/Engineering
|
||||
Summary: A free open-source mathematics software system
|
||||
Version: 6.1.1
|
||||
Release: 5%{?dist}
|
||||
Version: 6.2
|
||||
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
|
||||
|
|
@ -134,62 +111,59 @@ Patch12: %{name}-4ti2.patch
|
|||
# http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1317
|
||||
Patch13: %{name}-pari.patch
|
||||
|
||||
# Portuguese translations: http://trac.sagemath.org/sage_trac/ticket/12822
|
||||
Patch14: trac_12502_pt_translation_of_a_tour_of_sage_rebase1.patch
|
||||
Patch15: trac_12822_pt_translation_of_tutorial.patch
|
||||
Patch16: trac_12822_pt_translation_of_tutorial_rev1.patch
|
||||
|
||||
# use jmol itself to export preview images
|
||||
# FIXME besides not using X and told so, fails if DISPLAY is not set
|
||||
Patch17: %{name}-jmol.patch
|
||||
Patch14: %{name}-jmol.patch
|
||||
|
||||
# only cremona mini database built and installed
|
||||
# FIXME add a package with the full cremona database
|
||||
# FIXME actually it should be already available in pari-elldata
|
||||
Patch18: %{name}-cremona.patch
|
||||
Patch15: %{name}-cremona.patch
|
||||
|
||||
# lrslib is a requires
|
||||
Patch19: %{name}-lrslib.patch
|
||||
Patch16: %{name}-lrslib.patch
|
||||
|
||||
# nauty cannot be packaged due to license restrictions
|
||||
# http://cs.anu.edu.au/~bdm/nauty/
|
||||
# http://pallini.di.uniroma1.it/
|
||||
Patch20: %{name}-nauty.patch
|
||||
Patch17: %{name}-nauty.patch
|
||||
|
||||
# gap hap package not (yet) available
|
||||
# http://www-gap.mcs.st-and.ac.uk/Packages/hap.html
|
||||
Patch21: %{name}-gap-hap.patch
|
||||
Patch18: %{name}-gap-hap.patch
|
||||
|
||||
# Patch to enable lrcalc once review request is done in Fedora
|
||||
Patch22: %{name}-lrcalc.patch
|
||||
# enable lrcalc
|
||||
Patch19: %{name}-lrcalc.patch
|
||||
|
||||
# Patch to enable cbc once review requests are done in Fedora
|
||||
Patch23: %{name}-cbc.patch
|
||||
# enable cbc
|
||||
Patch20: %{name}-cbc.patch
|
||||
|
||||
# Use system gap directories
|
||||
Patch24: %{name}-libgap.patch
|
||||
Patch21: %{name}-libgap.patch
|
||||
|
||||
# Patch to enable fes once review requests are done in Fedora
|
||||
Patch25: %{name}-fes.patch
|
||||
# enable fes
|
||||
Patch22: %{name}-fes.patch
|
||||
|
||||
# Get package to build with known problem if not yet updated to pari 2.6.
|
||||
Patch26: %{name}-nopari2.6.patch
|
||||
|
||||
# sagemath 5.8 (optionally) requires cryptominisat 2.9.6 (in >= f19)
|
||||
# and does not work with cryptominisat 2.9.5 (in f18)
|
||||
Patch27: %{name}-cryptominisat.patch
|
||||
# enable cryptominisat
|
||||
Patch23: %{name}-cryptominisat.patch
|
||||
|
||||
# Side effect of using distro packages
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=974769
|
||||
Patch28: %{name}-sympy.patch
|
||||
Patch24: %{name}-sympy.patch
|
||||
|
||||
# Correct some warnings of newer sphinx that are treatead as errors
|
||||
# by default as of sagemath 6.2; other problems were fixed using
|
||||
# -k (keep-going)
|
||||
Patch25: %{name}-sphinx.patch
|
||||
|
||||
# Edited latest version from http://trac.sagemath.org/ticket/15767
|
||||
Patch26: %{name}-pari2.7.patch
|
||||
|
||||
BuildRequires: 4ti2
|
||||
BuildRequires: atlas-devel
|
||||
BuildRequires: cddlib-tools
|
||||
BuildRequires: cliquer-devel
|
||||
%if %{have_coin_or_Cbc}
|
||||
BuildRequires: coin-or-Cbc-devel
|
||||
%endif
|
||||
BuildRequires: cryptominisat-devel
|
||||
BuildRequires: Cython
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -222,9 +196,7 @@ BuildRequires: libfplll-devel
|
|||
BuildRequires: libgap-devel
|
||||
BuildRequires: libmpc-devel
|
||||
BuildRequires: linbox-devel
|
||||
%if %{have_lrcalc}
|
||||
BuildRequires: lrcalc-devel
|
||||
%endif
|
||||
BuildRequires: m4ri-devel
|
||||
BuildRequires: m4rie-devel
|
||||
BuildRequires: maxima-runtime-ecl
|
||||
|
|
@ -625,40 +597,24 @@ popd
|
|||
%patch11
|
||||
%patch12
|
||||
%patch13
|
||||
|
||||
pushd src
|
||||
mkdir -p doc/pt/a_tour_of_sage/
|
||||
cp -fa doc/en/a_tour_of_sage/*.png doc/pt/a_tour_of_sage/
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
popd
|
||||
|
||||
%patch14
|
||||
%patch15
|
||||
%patch16
|
||||
%patch17
|
||||
%patch18
|
||||
%patch19
|
||||
|
||||
%patch20
|
||||
%patch21
|
||||
|
||||
%if %{have_lrcalc}
|
||||
%if %{have_fes}
|
||||
%patch22
|
||||
%endif
|
||||
|
||||
# other coin-or packages are build requires or coin-or-Cbc
|
||||
%if %{have_coin_or_Cbc}
|
||||
%patch23
|
||||
%endif
|
||||
|
||||
%patch24
|
||||
|
||||
%if %{have_fes}
|
||||
%patch25
|
||||
%endif
|
||||
|
||||
%patch26
|
||||
%patch27
|
||||
%patch28
|
||||
%patch26 -p1
|
||||
|
||||
sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
|
||||
-e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
|
||||
|
|
@ -898,6 +854,12 @@ popd
|
|||
|
||||
#------------------------------------------------------------------------
|
||||
pushd build/pkgs/elliptic_curves
|
||||
# --short-circuit -bi debug build helper
|
||||
if [ ! -e src/ellcurves ]; then
|
||||
rm -fr src
|
||||
tar jxf ../../../upstream/%{elliptic_curves_pkg}.tar.bz2
|
||||
mv %{elliptic_curves_pkg} src
|
||||
fi
|
||||
%__python2 ./spkg-install
|
||||
popd
|
||||
|
||||
|
|
@ -961,19 +923,13 @@ export SAGE_ETC="$SAGE_ETC"
|
|||
export SAGE_SRC="$SAGE_SRC"
|
||||
##export SAGE_DOC="$SAGE_DOC"
|
||||
module load 4ti2-%{_arch}
|
||||
%if %{have_lrcalc}
|
||||
module load lrcalc-%{_arch}
|
||||
%endif
|
||||
module load surf-geometry-%{_arch}
|
||||
export PATH=$SAGE_LOCAL/bin:\$PATH
|
||||
export SINGULARPATH=%{_libdir}/Singular/LIB
|
||||
export SINGULAR_BIN_DIR=%{_libdir}/Singular
|
||||
##export PYTHONPATH="$SAGE_PYTHONPATH:\$SAGE_LOCAL/bin"
|
||||
%if 0%{?fedora}
|
||||
export SAGE_CBLAS=blas
|
||||
%else
|
||||
export SAGE_CBLAS=cblas
|
||||
%endif
|
||||
export SAGE_FORTRAN=%{_bindir}/gfortran
|
||||
export SAGE_FORTRAN_LIB=\`gfortran --print-file-name=libgfortran.so\`
|
||||
export SYMPOW_DIR="\$DOT_SAGE/sympow"
|
||||
|
|
@ -1011,7 +967,7 @@ pushd src
|
|||
popd
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
cp -f $SAGE_PYTHONPATH/{ANSI,FSM,pexpect,pxssh,screen}.py %{buildroot}%{python_sitearch}
|
||||
cp -f $SAGE_PYTHONPATH/{ANSI,FSM,pexpect,pxssh,screen}.py %{buildroot}%{python_sitearch}
|
||||
|
||||
# Build documentation, using %#{buildroot} environment
|
||||
pushd src/doc
|
||||
|
|
@ -1030,7 +986,7 @@ pushd src/doc
|
|||
|
||||
# there we go
|
||||
ln -sf %{buildroot}%{SAGE_DOC} $SAGE_SRC/doc
|
||||
python common/builder.py all html
|
||||
python common/builder.py -k all html
|
||||
export SAGE_DOC=%{buildroot}%{SAGE_DOC}
|
||||
cp -far output $SAGE_DOC
|
||||
|
||||
|
|
@ -1371,6 +1327,17 @@ exit 0
|
|||
|
||||
########################################################################
|
||||
%changelog
|
||||
* Mon May 26 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.2-1
|
||||
- Update to sagemath 6.2 (#1095282)
|
||||
- Rebuild with Singular 3.1.6 (#1074597)
|
||||
- Add missing python-docutils requires (#1056374)
|
||||
- Correct uninstall of sagemath-notebook (#1097428)
|
||||
- Enable coin-or-Cbc interface
|
||||
- Make coin-or-Cbc not optional
|
||||
- Make lrcalc not optional
|
||||
- Use upstream patch to support pari 2.7
|
||||
- Rediff ntl6 patch
|
||||
|
||||
* Wed Apr 2 2014 Jerry James <loganjerry@gmail.com> - 6.1.1-5
|
||||
- Rebuild for ntl 6.1.0
|
||||
- Fix ld ignoring __global_ldflags due to embedded trailing space
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue