Update to sagemath 8.6.

Also:
- Install an SVG icon instead of a fixed size (128x128) icon.
- Require hicolor-icon-theme since we install an icon.
- Drop obsolete Obsolete.
This commit is contained in:
Jerry James 2019-02-18 19:21:17 -07:00
parent 62dc22fafb
commit b6408b9313
5 changed files with 117 additions and 68 deletions

View file

@ -21,13 +21,13 @@
# not functional due to missing jar dependencies
%bcond_with sage3d
# use an workaround to match upstream sagemath patched sphinx
# use a workaround to match upstream sagemath patched sphinx
%bcond_without sphinx_hack
# use workaround to match upstream sagemath patched cython
%bcond_with cython_hack
%ifarch x86_64
%ifarch %{ix86} x86_64
%bcond_without fes
%else
%bcond_with fes
@ -73,7 +73,7 @@
# Spkg equivalents of required rpms; we pretend they are installed as spkgs.
# The version numbers shown are those of the latest released spkg, if the Fedora
# version is not behind.
%global SAGE_REQUIRED_PKGS 4ti2-1.6.7 cbc-2.9.4 CoCoALib-0.99564 cryptominisat-5.0.1 gap_packages-4.8.6new2.p0 gmp-6.1.2 gmpy2-2.1.0a4.p0 lrslib-062+autotools-2017-03-03 qepcad-B.1.71 saclib-2.2.7 sirocco-2.0 surf-1.0.6-gcc6
%global SAGE_REQUIRED_PKGS 4ti2-1.6.7 cbc-2.9.4 CoCoALib-0.99564 cryptominisat-5.0.1 gap_packages-4.10.0 gmp-6.1.2 gmpy2-2.1.0a4.p0 lrslib-062+autotools-2017-03-03 qepcad-B.1.71 saclib-2.2.7 sirocco-2.0 surf-1.0.6-gcc6
%global SAGE_ROOT %{_libdir}/sagemath
%global SAGE_LOCAL %{SAGE_ROOT}/local
@ -86,8 +86,8 @@
Name: sagemath
Summary: A free open-source mathematics software system
Version: 8.5
Release: 4%{?dist}
Version: 8.6
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
@ -356,7 +356,6 @@ Requires: cddlib-tools
Requires: ecl
Requires: gap
Requires: GAPDoc
Requires: gap-libs
Requires: gap-pkg-atlasrep
Requires: gap-pkg-crime
Requires: gap-pkg-design
@ -366,6 +365,7 @@ Requires: gap-pkg-sonata
Requires: gap-pkg-toric
Requires: gfan
Requires: gmp-ecm
Requires: hicolor-icon-theme
Requires: jmol
Requires: jsmol
Requires: jsmath-fonts
@ -467,7 +467,6 @@ packages into a common Python-based interface.
%package core
Summary: Open Source Mathematics Software
Requires: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-devel < 6.8-1
%if %{with bundled_ipython}
Provides: bundled(ipython) = %(cut -d- -f2- <<< %{ipython_pkg})
Provides: bundled(prompt_toolkit) = %(cut -d- -f2- <<< %{prompt_tookit_pkg})
@ -535,7 +534,6 @@ Includes two databases:
%package data-etc
Summary: Extcode for Sagemath
Requires: %{name}-data = %{version}-%{release}
Obsoletes: %{name}-data-extcode < %{version}
BuildArch: noarch
%description data-etc
@ -674,7 +672,7 @@ Summary: Several programs for working with Rubik's cubes
Requires: %{name}%{?_isa} = %{version}-%{release}
%description rubiks
Several programs for working with Rubik's cubes, by three different people.
Several programs for working with Rubik's cubes, by three different people.
In summary the three contributors are:
Michael Reid (GPL) http://www.math.ucf.edu/~reid/Rubik/optimal_solver.html
@ -698,12 +696,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: tex(color.sty)
Requires: tex(fancyvrb.sty)
Requires: tex(graphicx.sty)
Requires: tex(hyperref.sty)
Requires: tex(ifpdf.sty)
Requires: tex(ifthen.sty)
Requires: tex(ifxetex.sty)
Requires: tex(listings.sty)
Requires: tex(makecmds.sty)
Requires: tex(tikz.sty)
Requires: tex(verbatim.sty)
Requires: tex(xspace.sty)
%description sagetex
This is the SageTeX package. It allows you to embed code, results of
@ -935,8 +936,9 @@ sed -i 's/64m/128m/' src/sage/libs/gap/util.pyx
########################################################################
%build
%set_build_flags
export CC=%{__cc}
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
export SAGE_PYTHON_VERSION=3
export SAGE_ROOT=%{buildroot}%{SAGE_ROOT}
export SAGE_LOCAL=%{buildroot}%{SAGE_LOCAL}
@ -1435,9 +1437,8 @@ ln -sf %{SAGE_SHARE} $SAGE_ROOT/share
ln -sf src $SAGE_ROOT/devel
# Install menu and icons
pushd build/pkgs/sagenb/src/sagenb/data
install -p -m644 -D sage/images/icon128x128.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
popd
install -p -m644 -D src/ext/notebook-ipython/logo.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/sagemath.svg
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
[Desktop Entry]
@ -1587,7 +1588,7 @@ rm -fr $DOT_SAGE
%dir %{SAGE_PYTHONPATH}
# GPLv2+
%{_bindir}/sage
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/%{name}.desktop
%if %{with bundled_thebe}
# MIT
@ -1825,6 +1826,12 @@ rm -fr $DOT_SAGE
########################################################################
%changelog
* Mon Feb 18 2019 Jerry James <loganjerry@gmail.com> - 8.6-1
- Update to sagemath 8.6
- Install an SVG icon instead of a fixed size (128x128) icon
- Require hicolor-icon-theme since we install an icon
- Drop obsolete Obsoletes
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.5-4
- Rebuild for readline 8.0