From 6bc7f50d668bc2c2474da2c5949907ed8788cf31 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 30 Sep 2020 17:32:26 -0600 Subject: [PATCH] Rebuild for primecount 6.1. Bring back jmol/jsmol support. --- sagemath.spec | 159 ++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 83 deletions(-) diff --git a/sagemath.spec b/sagemath.spec index f24be72..b245927 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -20,9 +20,6 @@ %global blaslib openblas %endif -# jmol has been retired from Fedora; set this if it ever comes back -%bcond_with jmol - # for faster full rpm test builds %ifarch %{ix86} x86_64 %bcond_without docs @@ -277,11 +274,9 @@ BuildRequires: gmp-ecm-devel BuildRequires: gsl-devel BuildRequires: ImageMagick BuildRequires: iml-devel -%if %{with jmol} BuildRequires: jmol # To have a proper link BuildRequires: jsmol -%endif BuildRequires: jsmath-fonts BuildRequires: L-function-devel BuildRequires: latte-integrale @@ -321,53 +316,53 @@ BuildRequires: python3-cysignals-devel BuildRequires: python3-pillow-devel BuildRequires: python3-pplpy-devel BuildRequires: python3-tdlib-devel -BuildRequires: python3dist(brial) -BuildRequires: python3dist(cvxopt) -BuildRequires: python3dist(cython) -BuildRequires: python3dist(docutils) -BuildRequires: python3dist(fpylll) -BuildRequires: python3dist(future) -BuildRequires: python3dist(gmpy2) +BuildRequires: %{py3_dist brial} +BuildRequires: %{py3_dist cvxopt} +BuildRequires: %{py3_dist cython} +BuildRequires: %{py3_dist docutils} +BuildRequires: %{py3_dist fpylll} +BuildRequires: %{py3_dist future} +BuildRequires: %{py3_dist gmpy2} %if %{with sphinx_hack} -BuildRequires: python3dist(html5lib) -BuildRequires: python3dist(imagesize) +BuildRequires: %{py3_dist html5lib} +BuildRequires: %{py3_dist imagesize} %endif -BuildRequires: python3dist(ipykernel) +BuildRequires: %{py3_dist ipykernel} %if %{without bundled_ipython} -BuildRequires: python3dist(ipython) +BuildRequires: %{py3_dist ipython} %endif -BuildRequires: python3dist(kiwisolver) -BuildRequires: python3dist(matplotlib) -BuildRequires: python3dist(networkx) -BuildRequires: python3dist(notebook) +BuildRequires: %{py3_dist kiwisolver} +BuildRequires: %{py3_dist matplotlib} +BuildRequires: %{py3_dist networkx} +BuildRequires: %{py3_dist notebook} %if %{with bundled_ipython} -BuildRequires: python3dist(path.py) +BuildRequires: %{py3_dist path.py} %endif %if %{without bundled_pexpect} -BuildRequires: python3dist(pexpect) +BuildRequires: %{py3_dist pexpect} %endif %if %{with bundled_ipython} -BuildRequires: python3dist(pickleshare) +BuildRequires: %{py3_dist pickleshare} %endif -BuildRequires: python3dist(pip) -BuildRequires: python3dist(pkgconfig) -BuildRequires: python3dist(psutil) -BuildRequires: python3dist(ptyprocess) -BuildRequires: python3dist(pycryptosat) +BuildRequires: %{py3_dist pip} +BuildRequires: %{py3_dist pkgconfig} +BuildRequires: %{py3_dist psutil} +BuildRequires: %{py3_dist ptyprocess} +BuildRequires: %{py3_dist pycryptosat} %if %{with bundled_ipython} -BuildRequires: python3dist(pyzmq) +BuildRequires: %{py3_dist pyzmq} %endif -BuildRequires: python3dist(rpy2) -BuildRequires: python3dist(scipy) -BuildRequires: python3dist(scons) -BuildRequires: python3dist(setuptools) +BuildRequires: %{py3_dist rpy2} +BuildRequires: %{py3_dist scipy} +BuildRequires: %{py3_dist scons} +BuildRequires: %{py3_dist setuptools} %if %{with bundled_ipython} -BuildRequires: python3dist(simplegeneric) +BuildRequires: %{py3_dist simplegeneric} %endif -BuildRequires: python3dist(six) -BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(sympy) -BuildRequires: python3dist(zodb3) +BuildRequires: %{py3_dist six} +BuildRequires: %{py3_dist sphinx} +BuildRequires: %{py3_dist sympy} +BuildRequires: %{py3_dist zodb3} BuildRequires: qepcad-B BuildRequires: R BuildRequires: ratpoints-devel @@ -449,10 +444,8 @@ Requires: gap-pkg-toric Requires: gap-pkg-utils Requires: gfan Requires: gmp-ecm -%if %{with jmol} Requires: jmol Requires: jsmol -%endif Requires: jsmath-fonts Requires: latte-integrale Requires: libgap-devel @@ -465,50 +458,50 @@ Requires: pari-galdata Requires: pari-gp Requires: pari-seadata Requires: python3-tdlib -Requires: python3dist(brial) -Requires: python3dist(cypari2) -Requires: python3dist(cysignals) -Requires: python3dist(cvxopt) -Requires: python3dist(cython) -Requires: python3dist(docutils) -Requires: python3dist(fpylll) -Requires: python3dist(future) -Requires: python3dist(gmpy2) +Requires: %{py3_dist brial} +Requires: %{py3_dist cypari2} +Requires: %{py3_dist cysignals} +Requires: %{py3_dist cvxopt} +Requires: %{py3_dist cython} +Requires: %{py3_dist docutils} +Requires: %{py3_dist fpylll} +Requires: %{py3_dist future} +Requires: %{py3_dist gmpy2} %if %{with sphinx_hack} -Requires: python3dist(html5lib) -Requires: python3dist(imagesize) +Requires: %{py3_dist html5lib} +Requires: %{py3_dist imagesize} %endif -Requires: python3dist(ipykernel) +Requires: %{py3_dist ipykernel} %if %{without bundled_ipython} -Requires: python3dist(ipython) +Requires: %{py3_dist ipython} %endif -Requires: python3dist(matplotlib) -Requires: python3dist(networkx) +Requires: %{py3_dist matplotlib} +Requires: %{py3_dist networkx} %if %{with bundled_ipython} -Requires: python3dist(path.py) +Requires: %{py3_dist path.py} %endif %if %{without bundled_pexpect} -Requires: python3dist(pexpect) +Requires: %{py3_dist pexpect} %endif %if %{with bundled_ipython} -Requires: python3dist(pickleshare) +Requires: %{py3_dist pickleshare} %endif -Requires: python3dist(pplpy) -Requires: python3dist(psutil) -Requires: python3dist(ptyprocess) -Requires: python3dist(pycryptosat) +Requires: %{py3_dist pplpy} +Requires: %{py3_dist psutil} +Requires: %{py3_dist ptyprocess} +Requires: %{py3_dist pycryptosat} %if %{with bundled_ipython} -Requires: python3dist(pyzmq) +Requires: %{py3_dist pyzmq} %endif -Requires: python3dist(rpy2) -Requires: python3dist(scipy) +Requires: %{py3_dist rpy2} +Requires: %{py3_dist scipy} %if %{with bundled_ipython} -Requires: python3dist(simplegeneric) +Requires: %{py3_dist simplegeneric} %endif -Requires: python3dist(six) -Requires: python3dist(sphinx) -Requires: python3dist(sympy) -Requires: python3dist(zodb3) +Requires: %{py3_dist six} +Requires: %{py3_dist sphinx} +Requires: %{py3_dist sympy} +Requires: %{py3_dist zodb3} Requires: qepcad-B Requires: Singular # Required by thebe; remove when it is unbundled @@ -747,7 +740,7 @@ Eric Dietz (GPL) http://www.wrongway.org/?rubiksource %package sagetex Summary: Sagemath into LaTeX documents Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3dist(pillow) +Requires: %{py3_dist pillow} Requires: tex(color.sty) Requires: tex(fancyvrb.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 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' | \ - 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' | \ - 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' | \ - 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 '#!%{_bindir}/env' | \ xargs -0 sed -i 's,#!%{_bindir}/env ,#!%{_bindir}/,' 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} build/pkgs/pexpect/src/examples/python.py \ %endif @@ -1167,9 +1160,7 @@ pushd src/bin mkdir -p $SAGE_LOCAL/bin cp -fa sage-* $SAGE_LOCAL/bin pushd $SAGE_LOCAL/bin -%if %{with jmol} ln -sf %{_bindir}/jmol jmol -%endif ln -sf %{_bindir}/python3 sage.bin ln -sf %{_bindir}/python3 python ln -sf %{_bindir}/gp sage_pari @@ -1409,7 +1400,7 @@ pushd src/doc # python -m sage_setup.docbuild # Build with an X server running, required by some doc builders 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 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 -%py_byte_compile %{__python3} %{buildroot}%{_texmf}/tex/latex/sagetex +%py_byte_compile %{python3} %{buildroot}%{_texmf}/tex/latex/sagetex #------------------------------------------------------------------------ # Jupyter integration pushd src -%{__python3} << EOF +%{python3} << EOF from sage.repl.ipython_kernel.install import SageKernelSpec SageKernelSpec.update(prefix='%{buildroot}%{_prefix}') EOF @@ -1620,9 +1611,7 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ %{SAGE_LOCAL}/bin/QuadraticSieve %{SAGE_LOCAL}/bin/ecm %{SAGE_LOCAL}/bin/gap -%if %{with jmol} %{SAGE_LOCAL}/bin/jmol -%endif %if %{with bundled_ipython} %{SAGE_LOCAL}/bin/ip* %endif @@ -1824,6 +1813,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## %changelog +* Wed Sep 30 2020 Jerry James - 9.1-4 +- Rebuild for primecount 6.1 +- Bring back jmol/jsmol support + * Thu Aug 13 2020 Iñaki Úcar - 9.1-3 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager