diff --git a/sagemath-env.patch b/sagemath-env.patch index ba4a713..ee90541 100644 --- a/sagemath-env.patch +++ b/sagemath-env.patch @@ -1,6 +1,6 @@ diff -up src/sage/env.py.orig src/sage/env.py ---- src/sage/env.py.orig 2022-06-01 11:12:32.216196966 -0600 -+++ src/sage/env.py 2022-06-01 11:12:57.991304879 -0600 +--- src/sage/env.py.orig 2022-12-19 15:39:47.797902092 -0700 ++++ src/sage/env.py 2022-12-19 15:41:27.291049166 -0700 @@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner) @@ -37,8 +37,9 @@ diff -up src/sage/env.py.orig src/sage/env.py MAXIMA = var("MAXIMA", "maxima") MAXIMA_FAS = var("MAXIMA_FAS") KENZO_FAS = var("KENZO_FAS") - SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "") +-SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "") -RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "") ++SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "nauty-") +RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "rubiks_") FOURTITWO_HILBERT = var("FOURTITWO_HILBERT") FOURTITWO_MARKOV = var("FOURTITWO_MARKOV") diff --git a/sagemath.spec b/sagemath.spec index 0990f8a..46cab7f 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -84,11 +84,13 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 9.6 -Release: 2%{?dist} -# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file +Release: 3%{?dist} +# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file. +# Note that many of the components listed in that file are not built in, but +# are used as external libraries, and therefore do not affect the License tag. # Additionally, every $files section has a comment with the license name # before files with that license -License: ASL 2.0 and BSD and GPL+ and GPLv2+ and LGPLv2+ and MIT and Public Domain +License: GPL-3.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later URL: http://www.sagemath.org Source0: http://files.sagemath.org/src/sage-%{version}.tar.gz Source1: https://github.com/JohnCremona/ecdata/archive/%{cremona_ver}/cremona-%{cremona_ver}.tar.gz @@ -485,6 +487,7 @@ packages into a common Python-based interface. #------------------------------------------------------------------------ %package core +License: GPL-3.0-only AND GPL-2.0-or-later AND GPL-1.0-or-later AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND MIT AND BSD-3-Clause AND BSD-2-Clause AND EPL-1.0 AND PSF-2.0 Summary: Open Source Mathematics Software Requires: %{name}%{?_isa} = %{version}-%{release} Requires: 4ti2 @@ -545,7 +548,7 @@ Requires: jmol Requires: jsmol Requires: jsmath-fonts Requires: latte-integrale -Requires: libgap-devel +Requires: libgap Requires: lrslib-utils Requires: mathjax Requires: maxima-runtime-ecl @@ -663,6 +666,7 @@ Collection of databases and interface customization scripts for sagemath. #------------------------------------------------------------------------ %package data-combinatorial_designs +License: LicenseRef-Fedora-Public-Domain Summary: Table of MOLS from the Handbook of Combinatorial Designs Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -673,6 +677,7 @@ Designs, 2nd edition. #------------------------------------------------------------------------ %package data-conway_polynomials +License: GPL-2.0-or-later Summary: Conway Polynomials Database Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -682,6 +687,7 @@ Small database of Conway polynomials for sagemath. #------------------------------------------------------------------------ %package data-elliptic_curves +License: Artistic-2.0 Summary: Databases of elliptic curves Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -696,6 +702,7 @@ Includes two databases: #------------------------------------------------------------------------ %package data-elliptic_curves_large +License: Artistic-2.0 Summary: Large database of elliptic curves Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -708,6 +715,7 @@ http://johncremona.github.io/ecdata/. #------------------------------------------------------------------------ %package data-etc +License: GPL-2.0-or-later Summary: Extcode for Sagemath Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -717,6 +725,7 @@ Collection of scripts and interfaces to sagemath. #------------------------------------------------------------------------ %package data-graphs +License: LicenseRef-Fedora-Public-Domain Summary: Sagemath database of graphs Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -727,6 +736,7 @@ Grout. Since April 2012 it also contains the ISGCI graph database. #------------------------------------------------------------------------ %package data-polytopes_db +License: GPL-3.0-or-later Summary: Lists of 2- and 3-dimensional reflexive polytopes Requires: %{name}-data = %{version}-%{release} BuildArch: noarch @@ -743,6 +753,7 @@ ReflexivePolytope and ReflexivePolytopes commands. %if %{with docs} #------------------------------------------------------------------------ %package doc +License: CC-BY-SA-3.0 Summary: Documentation infrastructure files for %{name} Requires: mathjax @@ -751,6 +762,7 @@ This package contains the documentation infrastructure for %{name}. #------------------------------------------------------------------------ %package doc-ca +License: CC-BY-SA-3.0 Summary: Catalan documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -759,6 +771,7 @@ This package contains the Catalan %{name} documentation. #------------------------------------------------------------------------ %package doc-de +License: CC-BY-SA-3.0 Summary: German documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -767,6 +780,7 @@ This package contains the German %{name} documentation. #------------------------------------------------------------------------ %package doc-en +License: CC-BY-SA-3.0 Summary: English documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -775,6 +789,7 @@ This package contains the English %{name} documentation. #------------------------------------------------------------------------ %package doc-fr +License: CC-BY-SA-3.0 Summary: French documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -783,6 +798,7 @@ This package contains the French %{name} documentation. #------------------------------------------------------------------------ %package doc-hu +License: CC-BY-SA-3.0 Summary: Hungarian documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -791,6 +807,7 @@ This package contains the Hungarian %{name} documentation. #------------------------------------------------------------------------ %package doc-it +License: CC-BY-SA-3.0 Summary: Italian documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -799,6 +816,7 @@ This package contains the Italian %{name} documentation. #------------------------------------------------------------------------ %package doc-pt +License: CC-BY-SA-3.0 Summary: Portuguese documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -807,6 +825,7 @@ This package contains the Portuguese %{name} documentation. #------------------------------------------------------------------------ %package doc-ru +License: CC-BY-SA-3.0 Summary: Russian documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -815,6 +834,7 @@ This package contains the Russian %{name} documentation. #------------------------------------------------------------------------ %package doc-tr +License: CC-BY-SA-3.0 Summary: Turkish documentation files for %{name} Requires: %{name}-doc = %{version}-%{release} @@ -825,6 +845,7 @@ This package contains the Turkish %{name} documentation. #------------------------------------------------------------------------ %package jupyter +License: GPL-2.0-or-later AND MIT Summary: Jupyter integration for sagemath Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python-jupyter-filesystem @@ -841,6 +862,7 @@ defunct notebook functionality. #------------------------------------------------------------------------ %package sagetex +License: GPL-2.0-or-later Summary: Sagemath into LaTeX documents Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{py3_dist pillow} @@ -1018,6 +1040,9 @@ sed -e "s|'%{_bindir}/env', 'which'|'%{_bindir}/which'|" \ -i build/pkgs/ipython/src/IPython/utils/_process_posix.py %endif +# Remove bogus executable bits +chmod a-x src/sage/modules/fp_graded/{,steenrod/}*.py + # GAP does not have enough memory to load the entire workspace sed -i 's/64m/256m/' src/sage/interfaces/gap.py @@ -1784,7 +1809,7 @@ end %files -# GPLv2+ +# GPL-2.0-or-later %license COPYING.txt %doc %{SAGE_ROOT}/COPYING.txt %dir %{SAGE_ROOT} @@ -1801,7 +1826,6 @@ end %{SAGE_ROOT}/share %{SAGE_SRC}/ %dir %{SAGE_PYTHONPATH} -# GPLv2+ %{_bindir}/sage %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/org.%{name}.sage.desktop @@ -1813,19 +1837,22 @@ end #------------------------------------------------------------------------ %files core -# GPLv2+ +# GPL-2.0-or-later %{python3_sitearch}/sage/ %if %{without install_hack} %{python3_sitearch}/sage-*.egg-info %endif %if %{with bundled_ipython} +# BSD-3-Clause %{SAGE_PYTHONPATH}/IPython %{SAGE_PYTHONPATH}/prompt_toolkit* %endif %if %{with bundled_jupyter_jsmol} +# MIT AND BSD-3-Clause AND EPL-1.0 %{SAGE_PYTHONPATH}/jupyter_jsmol* %endif %if %{with bundled_memory_allocator} +# GPL-3.0-only AND LGPL-3.0-or-later %{SAGE_PYTHONPATH}/memory_allocator* %endif @@ -1842,25 +1869,25 @@ end #------------------------------------------------------------------------ %files data-conway_polynomials -# GPLv2+ +# GPL-2.0-or-later %{SAGE_SHARE}/conway_polynomials/ #------------------------------------------------------------------------ %files data-elliptic_curves -# GPLv2+ +# Artistic-2.0 %dir %{SAGE_SHARE}/cremona/ %{SAGE_SHARE}/cremona/cremona_mini.db %{SAGE_SHARE}/ellcurves/ #------------------------------------------------------------------------ %files data-elliptic_curves_large -# GPLv2+ +# Artistic-2.0 %dir %{SAGE_SHARE}/cremona/ %{SAGE_SHARE}/cremona/cremona.db #------------------------------------------------------------------------ %files data-etc -# GPLv2+ +# GPL-2.0-or-later %{SAGE_ETC}/doctest/ %{SAGE_ETC}/gap/ %{SAGE_ETC}/kenzo/ @@ -1875,19 +1902,19 @@ end #------------------------------------------------------------------------ %files data-graphs -# GPLv2+ +# Public Domain %{SAGE_ETC}/graphs/ %{SAGE_SHARE}/graphs/ #------------------------------------------------------------------------ %files data-polytopes_db -# GPL+ +# GPL-3.0-or-later %{SAGE_SHARE}/reflexive_polytopes/ %if %{with docs} #------------------------------------------------------------------------ %files doc -# GPLv2+ +# CC-BY-SA-3.0 %license COPYING.txt %dir %{SAGE_DOC}/ %{SAGE_DOC}/index.html @@ -1896,19 +1923,19 @@ end #------------------------------------------------------------------------ %files doc-ca -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/ca/ %{SAGE_DOC}/html/ca/ #------------------------------------------------------------------------ %files doc-de -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/de/ %{SAGE_DOC}/html/de/ #------------------------------------------------------------------------ %files doc-en -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/en/ %{SAGE_DOC}/html/en/ @@ -1983,37 +2010,37 @@ end #------------------------------------------------------------------------ %files doc-fr -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/fr/ %{SAGE_DOC}/html/fr/ #------------------------------------------------------------------------ %files doc-hu -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/hu/ %{SAGE_DOC}/html/hu/ #------------------------------------------------------------------------ %files doc-it -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/it/ %{SAGE_DOC}/html/it/ #------------------------------------------------------------------------ %files doc-pt -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/pt/ %{SAGE_DOC}/html/pt/ #------------------------------------------------------------------------ %files doc-ru -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/ru/ %{SAGE_DOC}/html/ru/ #------------------------------------------------------------------------ %files doc-tr -# GPLv2+ +# CC-BY-SA-3.0 %{SAGE_DOC}/tr/ %{SAGE_DOC}/html/tr/ # with docs @@ -2021,14 +2048,15 @@ end #------------------------------------------------------------------------ %files jupyter +# GPL-2.0-or-later %{SAGE_ETC}/notebook-ipython/ -# LGPLv2+ %{_datadir}/jupyter/kernels/sagemath/ +# MIT %{_datadir}/jupyter/nbextensions/threejs-sage #------------------------------------------------------------------------ %files sagetex -# GPLv2+ +# GPL-2.0-or-later %{python3_sitearch}/sagetex* %{python3_sitearch}/__pycache__/sagetex* %{_texmf}/tex/latex/sagetex/ @@ -2036,6 +2064,11 @@ end ######################################################################## %changelog +* Tue Dec 20 2022 Jerry James - 9.6-3 +- Fix failure to install (bz 2154932) +- Fix failure to find nauty binaries (bz 2125737) +- Convert License tags to SPDX + * Tue Jul 5 2022 Jerry James - 9.6-2 - Add workaround for symlink/directory conflict (bz 2097773) - Modify the jmol patch to timeout after 5 minutes. This is a workaround for