mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-18 10:19:03 -04:00
Rebuild for primecount 6.1. Bring back jmol/jsmol support.
This commit is contained in:
Jerry James
parent
3aee88cf4c
commit
6bc7f50d66
1 changed files with 76 additions and 83 deletions
159
sagemath.spec
159
sagemath.spec
|
|
@ -20,9 +20,6 @@
|
||||||
%global blaslib openblas
|
%global blaslib openblas
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# jmol has been retired from Fedora; set this if it ever comes back
|
|
||||||
%bcond_with jmol
|
|
||||||
|
|
||||||
# for faster full rpm test builds
|
# for faster full rpm test builds
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%bcond_without docs
|
%bcond_without docs
|
||||||
|
|
@ -277,11 +274,9 @@ BuildRequires: gmp-ecm-devel
|
||||||
BuildRequires: gsl-devel
|
BuildRequires: gsl-devel
|
||||||
BuildRequires: ImageMagick
|
BuildRequires: ImageMagick
|
||||||
BuildRequires: iml-devel
|
BuildRequires: iml-devel
|
||||||
%if %{with jmol}
|
|
||||||
BuildRequires: jmol
|
BuildRequires: jmol
|
||||||
# To have a proper link
|
# To have a proper link
|
||||||
BuildRequires: jsmol
|
BuildRequires: jsmol
|
||||||
%endif
|
|
||||||
BuildRequires: jsmath-fonts
|
BuildRequires: jsmath-fonts
|
||||||
BuildRequires: L-function-devel
|
BuildRequires: L-function-devel
|
||||||
BuildRequires: latte-integrale
|
BuildRequires: latte-integrale
|
||||||
|
|
@ -321,53 +316,53 @@ BuildRequires: python3-cysignals-devel
|
||||||
BuildRequires: python3-pillow-devel
|
BuildRequires: python3-pillow-devel
|
||||||
BuildRequires: python3-pplpy-devel
|
BuildRequires: python3-pplpy-devel
|
||||||
BuildRequires: python3-tdlib-devel
|
BuildRequires: python3-tdlib-devel
|
||||||
BuildRequires: python3dist(brial)
|
BuildRequires: %{py3_dist brial}
|
||||||
BuildRequires: python3dist(cvxopt)
|
BuildRequires: %{py3_dist cvxopt}
|
||||||
BuildRequires: python3dist(cython)
|
BuildRequires: %{py3_dist cython}
|
||||||
BuildRequires: python3dist(docutils)
|
BuildRequires: %{py3_dist docutils}
|
||||||
BuildRequires: python3dist(fpylll)
|
BuildRequires: %{py3_dist fpylll}
|
||||||
BuildRequires: python3dist(future)
|
BuildRequires: %{py3_dist future}
|
||||||
BuildRequires: python3dist(gmpy2)
|
BuildRequires: %{py3_dist gmpy2}
|
||||||
%if %{with sphinx_hack}
|
%if %{with sphinx_hack}
|
||||||
BuildRequires: python3dist(html5lib)
|
BuildRequires: %{py3_dist html5lib}
|
||||||
BuildRequires: python3dist(imagesize)
|
BuildRequires: %{py3_dist imagesize}
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3dist(ipykernel)
|
BuildRequires: %{py3_dist ipykernel}
|
||||||
%if %{without bundled_ipython}
|
%if %{without bundled_ipython}
|
||||||
BuildRequires: python3dist(ipython)
|
BuildRequires: %{py3_dist ipython}
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3dist(kiwisolver)
|
BuildRequires: %{py3_dist kiwisolver}
|
||||||
BuildRequires: python3dist(matplotlib)
|
BuildRequires: %{py3_dist matplotlib}
|
||||||
BuildRequires: python3dist(networkx)
|
BuildRequires: %{py3_dist networkx}
|
||||||
BuildRequires: python3dist(notebook)
|
BuildRequires: %{py3_dist notebook}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
BuildRequires: python3dist(path.py)
|
BuildRequires: %{py3_dist path.py}
|
||||||
%endif
|
%endif
|
||||||
%if %{without bundled_pexpect}
|
%if %{without bundled_pexpect}
|
||||||
BuildRequires: python3dist(pexpect)
|
BuildRequires: %{py3_dist pexpect}
|
||||||
%endif
|
%endif
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
BuildRequires: python3dist(pickleshare)
|
BuildRequires: %{py3_dist pickleshare}
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3dist(pip)
|
BuildRequires: %{py3_dist pip}
|
||||||
BuildRequires: python3dist(pkgconfig)
|
BuildRequires: %{py3_dist pkgconfig}
|
||||||
BuildRequires: python3dist(psutil)
|
BuildRequires: %{py3_dist psutil}
|
||||||
BuildRequires: python3dist(ptyprocess)
|
BuildRequires: %{py3_dist ptyprocess}
|
||||||
BuildRequires: python3dist(pycryptosat)
|
BuildRequires: %{py3_dist pycryptosat}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
BuildRequires: python3dist(pyzmq)
|
BuildRequires: %{py3_dist pyzmq}
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3dist(rpy2)
|
BuildRequires: %{py3_dist rpy2}
|
||||||
BuildRequires: python3dist(scipy)
|
BuildRequires: %{py3_dist scipy}
|
||||||
BuildRequires: python3dist(scons)
|
BuildRequires: %{py3_dist scons}
|
||||||
BuildRequires: python3dist(setuptools)
|
BuildRequires: %{py3_dist setuptools}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
BuildRequires: python3dist(simplegeneric)
|
BuildRequires: %{py3_dist simplegeneric}
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python3dist(six)
|
BuildRequires: %{py3_dist six}
|
||||||
BuildRequires: python3dist(sphinx)
|
BuildRequires: %{py3_dist sphinx}
|
||||||
BuildRequires: python3dist(sympy)
|
BuildRequires: %{py3_dist sympy}
|
||||||
BuildRequires: python3dist(zodb3)
|
BuildRequires: %{py3_dist zodb3}
|
||||||
BuildRequires: qepcad-B
|
BuildRequires: qepcad-B
|
||||||
BuildRequires: R
|
BuildRequires: R
|
||||||
BuildRequires: ratpoints-devel
|
BuildRequires: ratpoints-devel
|
||||||
|
|
@ -449,10 +444,8 @@ Requires: gap-pkg-toric
|
||||||
Requires: gap-pkg-utils
|
Requires: gap-pkg-utils
|
||||||
Requires: gfan
|
Requires: gfan
|
||||||
Requires: gmp-ecm
|
Requires: gmp-ecm
|
||||||
%if %{with jmol}
|
|
||||||
Requires: jmol
|
Requires: jmol
|
||||||
Requires: jsmol
|
Requires: jsmol
|
||||||
%endif
|
|
||||||
Requires: jsmath-fonts
|
Requires: jsmath-fonts
|
||||||
Requires: latte-integrale
|
Requires: latte-integrale
|
||||||
Requires: libgap-devel
|
Requires: libgap-devel
|
||||||
|
|
@ -465,50 +458,50 @@ Requires: pari-galdata
|
||||||
Requires: pari-gp
|
Requires: pari-gp
|
||||||
Requires: pari-seadata
|
Requires: pari-seadata
|
||||||
Requires: python3-tdlib
|
Requires: python3-tdlib
|
||||||
Requires: python3dist(brial)
|
Requires: %{py3_dist brial}
|
||||||
Requires: python3dist(cypari2)
|
Requires: %{py3_dist cypari2}
|
||||||
Requires: python3dist(cysignals)
|
Requires: %{py3_dist cysignals}
|
||||||
Requires: python3dist(cvxopt)
|
Requires: %{py3_dist cvxopt}
|
||||||
Requires: python3dist(cython)
|
Requires: %{py3_dist cython}
|
||||||
Requires: python3dist(docutils)
|
Requires: %{py3_dist docutils}
|
||||||
Requires: python3dist(fpylll)
|
Requires: %{py3_dist fpylll}
|
||||||
Requires: python3dist(future)
|
Requires: %{py3_dist future}
|
||||||
Requires: python3dist(gmpy2)
|
Requires: %{py3_dist gmpy2}
|
||||||
%if %{with sphinx_hack}
|
%if %{with sphinx_hack}
|
||||||
Requires: python3dist(html5lib)
|
Requires: %{py3_dist html5lib}
|
||||||
Requires: python3dist(imagesize)
|
Requires: %{py3_dist imagesize}
|
||||||
%endif
|
%endif
|
||||||
Requires: python3dist(ipykernel)
|
Requires: %{py3_dist ipykernel}
|
||||||
%if %{without bundled_ipython}
|
%if %{without bundled_ipython}
|
||||||
Requires: python3dist(ipython)
|
Requires: %{py3_dist ipython}
|
||||||
%endif
|
%endif
|
||||||
Requires: python3dist(matplotlib)
|
Requires: %{py3_dist matplotlib}
|
||||||
Requires: python3dist(networkx)
|
Requires: %{py3_dist networkx}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
Requires: python3dist(path.py)
|
Requires: %{py3_dist path.py}
|
||||||
%endif
|
%endif
|
||||||
%if %{without bundled_pexpect}
|
%if %{without bundled_pexpect}
|
||||||
Requires: python3dist(pexpect)
|
Requires: %{py3_dist pexpect}
|
||||||
%endif
|
%endif
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
Requires: python3dist(pickleshare)
|
Requires: %{py3_dist pickleshare}
|
||||||
%endif
|
%endif
|
||||||
Requires: python3dist(pplpy)
|
Requires: %{py3_dist pplpy}
|
||||||
Requires: python3dist(psutil)
|
Requires: %{py3_dist psutil}
|
||||||
Requires: python3dist(ptyprocess)
|
Requires: %{py3_dist ptyprocess}
|
||||||
Requires: python3dist(pycryptosat)
|
Requires: %{py3_dist pycryptosat}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
Requires: python3dist(pyzmq)
|
Requires: %{py3_dist pyzmq}
|
||||||
%endif
|
%endif
|
||||||
Requires: python3dist(rpy2)
|
Requires: %{py3_dist rpy2}
|
||||||
Requires: python3dist(scipy)
|
Requires: %{py3_dist scipy}
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
Requires: python3dist(simplegeneric)
|
Requires: %{py3_dist simplegeneric}
|
||||||
%endif
|
%endif
|
||||||
Requires: python3dist(six)
|
Requires: %{py3_dist six}
|
||||||
Requires: python3dist(sphinx)
|
Requires: %{py3_dist sphinx}
|
||||||
Requires: python3dist(sympy)
|
Requires: %{py3_dist sympy}
|
||||||
Requires: python3dist(zodb3)
|
Requires: %{py3_dist zodb3}
|
||||||
Requires: qepcad-B
|
Requires: qepcad-B
|
||||||
Requires: Singular
|
Requires: Singular
|
||||||
# Required by thebe; remove when it is unbundled
|
# Required by thebe; remove when it is unbundled
|
||||||
|
|
@ -747,7 +740,7 @@ Eric Dietz (GPL) http://www.wrongway.org/?rubiksource
|
||||||
%package sagetex
|
%package sagetex
|
||||||
Summary: Sagemath into LaTeX documents
|
Summary: Sagemath into LaTeX documents
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: python3dist(pillow)
|
Requires: %{py3_dist pillow}
|
||||||
Requires: tex(color.sty)
|
Requires: tex(color.sty)
|
||||||
Requires: tex(fancyvrb.sty)
|
Requires: tex(fancyvrb.sty)
|
||||||
Requires: tex(graphicx.sty)
|
Requires: tex(graphicx.sty)
|
||||||
|
|
@ -946,18 +939,18 @@ sed -e "s,\(SINGULAR_SO = \)SAGE.*,\1'%{_libdir}/libSingular-$singver.so'," \
|
||||||
|
|
||||||
# fix shebangs; some paths contains spaces, so use the null byte facility
|
# fix shebangs; some paths contains spaces, so use the null byte facility
|
||||||
grep -FrlZ '#!%{_bindir}/env python3' | \
|
grep -FrlZ '#!%{_bindir}/env python3' | \
|
||||||
xargs -0 sed -i 's,#!%{_bindir}/env python3,#!%{__python3},g'
|
xargs -0 sed -i 's,#!%{_bindir}/env python3,#!%{python3},g'
|
||||||
grep -FrlZ '#!%{_bindir}/env python' | \
|
grep -FrlZ '#!%{_bindir}/env python' | \
|
||||||
xargs -0 sed -i 's,#!%{_bindir}/env python,#!%{__python3},g'
|
xargs -0 sed -i 's,#!%{_bindir}/env python,#!%{python3},g'
|
||||||
grep -FrlZ '#!%{_bindir}/env sage-system-python' | \
|
grep -FrlZ '#!%{_bindir}/env sage-system-python' | \
|
||||||
xargs -0 sed -i 's,#!%{_bindir}/env sage-system-python,#!%{__python3},g'
|
xargs -0 sed -i 's,#!%{_bindir}/env sage-system-python,#!%{python3},g'
|
||||||
grep -FrlZ '#!%{_bindir}/env sage-python' | \
|
grep -FrlZ '#!%{_bindir}/env sage-python' | \
|
||||||
xargs -0 sed -i 's,#!%{_bindir}/env sage-python,#!%{__python3},g'
|
xargs -0 sed -i 's,#!%{_bindir}/env sage-python,#!%{python3},g'
|
||||||
grep -FrlZ 'sage-python23' | xargs -0 sed -i 's,sage-python23,python3,g'
|
grep -FrlZ 'sage-python23' | xargs -0 sed -i 's,sage-python23,python3,g'
|
||||||
grep -FrlZ '#!%{_bindir}/env' | \
|
grep -FrlZ '#!%{_bindir}/env' | \
|
||||||
xargs -0 sed -i 's,#!%{_bindir}/env ,#!%{_bindir}/,'
|
xargs -0 sed -i 's,#!%{_bindir}/env ,#!%{_bindir}/,'
|
||||||
grep -rlZ '#!%{_bindir}/python$' | xargs -0 sed -i 's,#!%{_bindir}/python$,&3,'
|
grep -rlZ '#!%{_bindir}/python$' | xargs -0 sed -i 's,#!%{_bindir}/python$,&3,'
|
||||||
sed -i 's,%{_bindir}/env python,%{__python3},' \
|
sed -i 's,%{_bindir}/env python,%{python3},' \
|
||||||
%if %{with bundled_pexpect}
|
%if %{with bundled_pexpect}
|
||||||
build/pkgs/pexpect/src/examples/python.py \
|
build/pkgs/pexpect/src/examples/python.py \
|
||||||
%endif
|
%endif
|
||||||
|
|
@ -1167,9 +1160,7 @@ pushd src/bin
|
||||||
mkdir -p $SAGE_LOCAL/bin
|
mkdir -p $SAGE_LOCAL/bin
|
||||||
cp -fa sage-* $SAGE_LOCAL/bin
|
cp -fa sage-* $SAGE_LOCAL/bin
|
||||||
pushd $SAGE_LOCAL/bin
|
pushd $SAGE_LOCAL/bin
|
||||||
%if %{with jmol}
|
|
||||||
ln -sf %{_bindir}/jmol jmol
|
ln -sf %{_bindir}/jmol jmol
|
||||||
%endif
|
|
||||||
ln -sf %{_bindir}/python3 sage.bin
|
ln -sf %{_bindir}/python3 sage.bin
|
||||||
ln -sf %{_bindir}/python3 python
|
ln -sf %{_bindir}/python3 python
|
||||||
ln -sf %{_bindir}/gp sage_pari
|
ln -sf %{_bindir}/gp sage_pari
|
||||||
|
|
@ -1409,7 +1400,7 @@ pushd src/doc
|
||||||
# python -m sage_setup.docbuild
|
# python -m sage_setup.docbuild
|
||||||
# Build with an X server running, required by some doc builders
|
# Build with an X server running, required by some doc builders
|
||||||
SAGE_NUM_THREADS=2 \
|
SAGE_NUM_THREADS=2 \
|
||||||
xvfb-run -a -n 1 %__python3 -m docbuild --no-pdf-links -k all html -j
|
xvfb-run -d %__python3 -m docbuild --no-pdf-links -k all html -j
|
||||||
rm -f %{buildroot}%{SAGE_SRC}/doc
|
rm -f %{buildroot}%{SAGE_SRC}/doc
|
||||||
ln -sf %{SAGE_DOC} %{buildroot}%{SAGE_SRC}/doc
|
ln -sf %{SAGE_DOC} %{buildroot}%{SAGE_SRC}/doc
|
||||||
|
|
||||||
|
|
@ -1557,12 +1548,12 @@ chmod +x %{buildroot}%{SAGE_LOCAL}/bin/sage-list-packages
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# Byte compile python files in nonstandard places
|
# Byte compile python files in nonstandard places
|
||||||
%py_byte_compile %{__python3} %{buildroot}%{_texmf}/tex/latex/sagetex
|
%py_byte_compile %{python3} %{buildroot}%{_texmf}/tex/latex/sagetex
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
# Jupyter integration
|
# Jupyter integration
|
||||||
pushd src
|
pushd src
|
||||||
%{__python3} << EOF
|
%{python3} << EOF
|
||||||
from sage.repl.ipython_kernel.install import SageKernelSpec
|
from sage.repl.ipython_kernel.install import SageKernelSpec
|
||||||
SageKernelSpec.update(prefix='%{buildroot}%{_prefix}')
|
SageKernelSpec.update(prefix='%{buildroot}%{_prefix}')
|
||||||
EOF
|
EOF
|
||||||
|
|
@ -1620,9 +1611,7 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
|
||||||
%{SAGE_LOCAL}/bin/QuadraticSieve
|
%{SAGE_LOCAL}/bin/QuadraticSieve
|
||||||
%{SAGE_LOCAL}/bin/ecm
|
%{SAGE_LOCAL}/bin/ecm
|
||||||
%{SAGE_LOCAL}/bin/gap
|
%{SAGE_LOCAL}/bin/gap
|
||||||
%if %{with jmol}
|
|
||||||
%{SAGE_LOCAL}/bin/jmol
|
%{SAGE_LOCAL}/bin/jmol
|
||||||
%endif
|
|
||||||
%if %{with bundled_ipython}
|
%if %{with bundled_ipython}
|
||||||
%{SAGE_LOCAL}/bin/ip*
|
%{SAGE_LOCAL}/bin/ip*
|
||||||
%endif
|
%endif
|
||||||
|
|
@ -1824,6 +1813,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 30 2020 Jerry James <loganjerry@gmail.com> - 9.1-4
|
||||||
|
- Rebuild for primecount 6.1
|
||||||
|
- Bring back jmol/jsmol support
|
||||||
|
|
||||||
* Thu Aug 13 2020 Iñaki Úcar <iucar@fedoraproject.org> - 9.1-3
|
* Thu Aug 13 2020 Iñaki Úcar <iucar@fedoraproject.org> - 9.1-3
|
||||||
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue