zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Version 9.1.

Browse source 
- Drop upstreamed -nauty patch.
- Drop -cbc patch; upstream uses the system Cbc now.
- Add -ecl patch for ecl 20.4.24.
This commit is contained in:
Jerry James 2020-07-10 11:04:09 -06:00
parent 4556e3ebb0
commit eb706cd5f8
15 changed files with 838 additions and 732 deletions
Download patch file Download diff file Expand all files Collapse all files

47
sagemath.spec
View file

@ -76,7 +76,7 @@
%endif
# Spkg equivalents of required rpms; we pretend they are installed as spkgs.
%global SAGE_REQUIRED_PKGS 4ti2-1.6.9 bliss-0.73 cbc-2.10.4 CoCoALib-0.99650 coxeter3-3.1 cryptominisat-5.6.8 database_cremona_ellcurve-%{cremona_ver} gap_packages-4.10.2 gmp-6.1.2 libsirocco-2.0.2 lrslib-070 mcqd-1.0 meataxe-1.0 primecount-5.3 qepcad-B.1.72 saclib-2.2.7 surf-1.0.6-gcc6 tdlib-0.9.0
%global SAGE_REQUIRED_PKGS 4ti2-1.6.9 bliss-0.73 CoCoALib-0.99710 coxeter3-3.1 cryptominisat-5.7.1 database_cremona_ellcurve-%{cremona_ver} gap_packages-4.11.0 libsirocco-2.0.2 lrslib-071 mcqd-1.0 meataxe-1.0 primecount-6.0 qepcad-B.1.72 saclib-2.2.7 surf-1.0.6-gcc6 tdlib-0.9.0
%ifarch %{ix86} x86_64
%global SAGE_REQUIRED_PKGS %{SAGE_REQUIRED_PKGS} fes-0.2
@ -93,8 +93,8 @@
Name: sagemath
Summary: A free open-source mathematics software system
Version: 9.0
Release: 8%{?dist}
Version: 9.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
@ -152,8 +152,8 @@ Patch10: %{name}-cremona.patch
# adapt to python 3 and cython running in python 3 mode
Patch11: %{name}-python3.patch
# correct path to the nauty geng program
Patch12: %{name}-nauty.patch
# adapt to ecl 20.4.24
Patch12: %{name}-ecl.patch
# remove the buildroot path from Cython output
Patch13: %{name}-buildroot.patch
@ -161,9 +161,6 @@ Patch13: %{name}-buildroot.patch
# update c++ standard to fix FTBFS
Patch14: %{name}-lcalc.patch
# avoid assertion in coin backend
Patch15: %{name}-cbc.patch
# Use system gap directories and modernize libgap interface
Patch16: %{name}-libgap.patch
@ -218,6 +215,7 @@ BuildRequires: arb-devel
BuildRequires: bliss-devel
BuildRequires: boost-devel
BuildRequires: brial-devel
BuildRequires: cddlib-devel
BuildRequires: cddlib-tools
BuildRequires: cliquer-devel
BuildRequires: coin-or-Cbc-devel
@ -231,7 +229,7 @@ BuildRequires: factory-devel
BuildRequires: fes-devel
%endif
BuildRequires: flint-devel
BuildRequires: gap
BuildRequires: gap-devel
BuildRequires: gap-pkg-cohomolo
BuildRequires: gap-pkg-corelg
BuildRequires: gap-pkg-crime
@ -281,7 +279,7 @@ BuildRequires: lapack-devel
BuildRequires: latte-integrale
BuildRequires: libbraiding-devel
BuildRequires: libfplll-devel
BuildRequires: libgap-devel
BuildRequires: libgap
BuildRequires: libhomfly-devel
BuildRequires: libmpc-devel
BuildRequires: libpng-devel
@ -359,7 +357,6 @@ BuildRequires: python3dist(setuptools)
BuildRequires: python3dist(simplegeneric)
%endif
BuildRequires: python3dist(six)
BuildRequires: python3dist(speaklater)
BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(sympy)
BuildRequires: python3dist(zodb3)
@ -896,7 +893,6 @@ popd
%patch12
%patch13
%patch14
%patch15
%patch16
%if %{with fes}
@ -962,6 +958,7 @@ sed -i 's,%{_bindir}/python,&3,' src/sage/misc/dev_tools.py
sed -e 's,local/bin/python,bin/python,' \
-e 's,#!%{_bindir}/python,&3,' \
-i src/sage/repl/preparse.py
sed -i 's,"$SAGE_LOCAL"/bin/python,%{_bindir}/python,g' src/bin/sage
%if %{with bundled_ipython}
sed -e "s|'%{_bindir}/env', 'which'|'%{_bindir}/which'|" \
-i build/pkgs/ipython/src/IPython/utils/_process_posix.py
@ -973,6 +970,7 @@ sed -i 's/64m/256m/' src/sage/interfaces/gap.py
########################################################################
%build
export LC_ALL=C.UTF-8
export CC=%{__cc}
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
@ -1130,8 +1128,7 @@ ln -sf %{_includedir} $SAGE_LOCAL/include
ln -sf %{_datadir} $SAGE_LOCAL/share
#------------------------------------------------------------------------
cp -a src/ext $SAGE_ETC
rm -fr $SAGE_ETC/doctest
cp -a src/sage/ext_data $SAGE_ETC
cp -p %{SOURCE2} $SAGE_ETC
#------------------------------------------------------------------------
@ -1241,8 +1238,8 @@ popd
#------------------------------------------------------------------------
pushd build/pkgs/combinatorial_designs
chmod a+x spkg-install
bash -c '. ../../../src/bin/sage-dist-helpers; ./spkg-install'
mkdir -p $SAGE_SHARE/combinatorial_designs
cp -fa src/* $SAGE_SHARE/combinatorial_designs
popd
#------------------------------------------------------------------------
@ -1286,13 +1283,13 @@ popd
#------------------------------------------------------------------------
%if %{with bundled_ipython}
mv %{_builddir}%{python3_sitelib}/IPython %{buildroot}%{SAGE_PYTHONPATH}
mv %{_builddir}%{python3_sitelib}/prompt_toolkit %{buildroot}%{SAGE_PYTHONPATH}
mv %{_builddir}%{python3_sitelib}/prompt_toolkit* %{buildroot}%{SAGE_PYTHONPATH}
mv %{_builddir}%{_bindir}/ip* %{buildroot}%{SAGE_LOCAL}/bin
%endif
#------------------------------------------------------------------------
%if %{with bundled_ipywidgets}
mv %{_builddir}%{python3_sitelib}/ipywidgets %{buildroot}%{SAGE_PYTHONPATH}
mv %{_builddir}%{python3_sitelib}/ipywidgets* %{buildroot}%{SAGE_PYTHONPATH}
%endif
#------------------------------------------------------------------------
@ -1454,7 +1451,7 @@ ln -sf %{SAGE_SHARE} $SAGE_ROOT/share
ln -sf src $SAGE_ROOT/devel
# Install menu and icons
install -p -m644 -D src/ext/notebook-ipython/logo.svg \
install -p -m644 -D src/sage/ext_data/notebook-ipython/logo.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/sagemath.svg
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
@ -1659,10 +1656,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
%endif
%if %{with bundled_ipython}
%{SAGE_PYTHONPATH}/IPython
%{SAGE_PYTHONPATH}/prompt_toolkit
%{SAGE_PYTHONPATH}/prompt_toolkit*
%endif
%if %{with bundled_ipywidgets}
%{SAGE_PYTHONPATH}/ipywidgets
%{SAGE_PYTHONPATH}/ipywidgets*
%endif
#------------------------------------------------------------------------
@ -1698,12 +1695,14 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
#------------------------------------------------------------------------
%files data-etc
# GPLv2+
%{SAGE_ETC}/doctest
%{SAGE_ETC}/gap
%{SAGE_ETC}/images
%{SAGE_ETC}/kenzo
%{SAGE_ETC}/magma
%{SAGE_ETC}/mwrank
%{SAGE_ETC}/nbconvert
%{SAGE_ETC}/nodoctest
%{SAGE_ETC}/pari
%{SAGE_ETC}/singular
%{SAGE_ETC}/threejs
@ -1817,6 +1816,12 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
########################################################################
%changelog
* Fri Jul 10 2020 Jerry James <loganjerry@gmail.com> - 9.1-1
- Version 9.1
- Drop upstreamed -nauty patch
- Drop -cbc patch; upstream uses the system Cbc now
- Add -ecl patch for ecl 20.4.24
* Wed May 27 2020 Miro Hrončok <mhroncok@redhat.com> - 9.0-8
- Rebuilt for Python 3.9