From db8b5a20c1bae8c04a4d39b14940c6a21b920157 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 18 Aug 2021 20:28:49 -0600 Subject: [PATCH] Unbundle flintqs. - Require gp2c and pari-nftables. - Add requirement for python3-pari-jupyter to the -jupyter subpackage. --- sagemath.spec | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/sagemath.spec b/sagemath.spec index 9ed6cfc..1173b01 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -39,7 +39,6 @@ %global conway_polynomials_pkg conway_polynomials-0.5 %global cremona_ver 2019-10-29 %global elliptic_curves_pkg elliptic_curves-0.8.1 -%global flintqs_pkg flintqs-1.0 %global graphs_pkg graphs-20210214 %if %{with bundled_ipython} %global ipython_ver 7.13.0 @@ -90,7 +89,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.3 -Release: 4%{?dist} +Release: 5%{?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 @@ -169,7 +168,7 @@ Patch16: %{name}-env.patch Patch17: %{name}-qepcad.patch # Make the cvxopt backend check for 'optimal' as well as 'optimized' -Patch18: %{name}-cvxopt.patch +Patch18: %{name}-cvxopt.patch # Use flexiblas Patch19: %{name}-flexiblas.patch @@ -215,6 +214,7 @@ BuildRequires: fes-devel %endif BuildRequires: flexiblas-devel BuildRequires: flint-devel +BuildRequires: flintqs BuildRequires: gap-devel BuildRequires: gap-pkg-aclib BuildRequires: gap-pkg-alnuth @@ -272,6 +272,7 @@ BuildRequires: glpk-devel BuildRequires: glpk-utils BuildRequires: gmp-ecm BuildRequires: gmp-ecm-devel +BuildRequires: gp2c BuildRequires: ImageMagick BuildRequires: iml-devel BuildRequires: jmol @@ -304,6 +305,7 @@ BuildRequires: pari-elldata BuildRequires: pari-galdata BuildRequires: pari-galpol BuildRequires: pari-gp +BuildRequires: pari-nftables BuildRequires: pari-seadata BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) @@ -371,6 +373,7 @@ BuildRequires: %{py3_dist kiwisolver} BuildRequires: %{py3_dist matplotlib} BuildRequires: %{py3_dist networkx} BuildRequires: %{py3_dist notebook} +BuildRequires: %{py3_dist pari-jupyter} %if %{with bundled_ipython} BuildRequires: %{py3_dist path.py} %endif @@ -455,6 +458,7 @@ Summary: Open Source Mathematics Software Requires: %{name}%{?_isa} = %{version}-%{release} Requires: 4ti2 Requires: cddlib-tools +Requires: flintqs Requires: gap Requires: gap-pkg-aclib Requires: gap-pkg-alnuth @@ -501,6 +505,7 @@ Requires: gap-pkg-toric Requires: gap-pkg-utils Requires: gfan Requires: gmp-ecm +Requires: gp2c Requires: jmol Requires: jsmol Requires: jsmath-fonts @@ -515,6 +520,7 @@ Requires: pari-elldata Requires: pari-galdata Requires: pari-galpol Requires: pari-gp +Requires: pari-nftables Requires: pari-seadata Requires: python3-tdlib %if %{with bundled_ipython} @@ -768,6 +774,7 @@ Summary: Jupyter integration for sagemath Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python-jupyter-filesystem Requires: %{py3_dist argon2-cffi} +Requires: %{py3_dist pari-jupyter} Requires: %{py3_dist widgetsnbextension} %description jupyter @@ -817,11 +824,6 @@ pushd build/pkgs/elliptic_curves mv %{elliptic_curves_pkg} src popd -pushd build/pkgs/flintqs - tar zxf ../../../upstream/%{flintqs_pkg}.tar.bz2 - mv %{flintqs_pkg} src -popd - pushd build/pkgs/graphs tar jxf ../../../upstream/%{graphs_pkg}.tar.bz2 mv %{graphs_pkg} src @@ -995,9 +997,9 @@ sed -i 's/3\.10\.0/3.11.0/g' configure sed -i 's/1\[1-9\]/1[2-9]/' configure # Allow use of pari 2.13.1 -sed -e 's/Mod(0, 2)/0/' configure \ +sed -e 's/Mod(0, 2)/0/' \ -e 's,share/doc/pari/pari\.cfg,%{_lib}/pari/pari.cfg,' \ - -i build/pkgs/gp2c/spkg-configure.m4 configure + -i configure # Allow use of fplll 5.4.1 sed -i 's/5\.4\.0/5.4.1/g' configure @@ -1131,12 +1133,6 @@ pushd build/pkgs/sagetex/src %{python3} ./setup.py build popd -#------------------------------------------------------------------------ -pushd build/pkgs/flintqs/src - %configure - make %{?_smp_mflags} CPP="g++ %{optflags} -fPIC" -popd - # last build command rm -fr $DOT_SAGE @@ -1219,11 +1215,6 @@ pushd src/bin popd install -p -m755 src/bin/sage $SAGE_LOCAL/bin -#------------------------------------------------------------------------ -pushd build/pkgs/flintqs/src - cp -fa src/QuadraticSieve $SAGE_LOCAL/bin -popd - #------------------------------------------------------------------------ pushd $SAGE_LOCAL/bin/ rm -f \ @@ -1506,7 +1497,6 @@ appstreamcli validate --no-net \ # Fix permissions find %{buildroot} -name '*.so' -exec chmod 755 {} \+ -chmod 755 %{buildroot}%{SAGE_LOCAL}/bin/QuadraticSieve chmod 755 %{buildroot}%{python3_sitearch}/sage/ext_data/pari/dokchitser/testall for file in `find %{buildroot} -name \*.py`; do if head -1 $file | grep -q '^#!'; then @@ -2007,6 +1997,11 @@ end ######################################################################## %changelog +* Wed Aug 18 2021 Jerry James - 9.3-5 +- Unbundle flintqs +- Require gp2c and pari-nftables +- Add requirement for python3-pari-jupyter to the -jupyter subpackage + * Fri Jul 23 2021 Fedora Release Engineering - 9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild