mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 19:55:54 -04:00
Rebuild for ntl 9.8.0.
Also, nauty is now available under a free license, so use it.
This commit is contained in:
parent
0a631244e3
commit
cb1cb96696
2 changed files with 17 additions and 12 deletions
|
@ -1,13 +1,12 @@
|
||||||
diff -up src/sage/graphs/graph_generators.py.orig src/sage/graphs/graph_generators.py
|
diff -up src/sage/graphs/graph_generators.py.orig src/sage/graphs/graph_generators.py
|
||||||
--- src/sage/graphs/graph_generators.py.orig 2015-10-11 17:55:39.963810018 -0300
|
--- src/sage/graphs/graph_generators.py.orig 2015-07-26 07:34:43.000000000 -0600
|
||||||
+++ src/sage/graphs/graph_generators.py 2015-10-11 17:55:46.861810283 -0300
|
+++ src/sage/graphs/graph_generators.py 2016-04-28 21:13:15.214276462 -0600
|
||||||
@@ -838,8 +838,7 @@ class GraphGenerators():
|
@@ -841,7 +841,7 @@ class GraphGenerators():
|
||||||
>A geng -d0D3 n=4 e=0-6
|
from sage.misc.package import is_package_installed
|
||||||
"""
|
if not is_package_installed("nauty"):
|
||||||
import subprocess
|
|
||||||
- from sage.misc.package import is_package_installed
|
|
||||||
- if not is_package_installed("nauty"):
|
|
||||||
+ if 1:
|
|
||||||
raise TypeError("the optional nauty package is not installed")
|
raise TypeError("the optional nauty package is not installed")
|
||||||
sp = subprocess.Popen("geng {0}".format(options), shell=True,
|
- sp = subprocess.Popen("geng {0}".format(options), shell=True,
|
||||||
|
+ sp = subprocess.Popen("nauty-geng {0}".format(options), shell=True,
|
||||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
|
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE, close_fds=True)
|
||||||
|
if debug:
|
||||||
|
|
|
@ -52,7 +52,7 @@ Name: sagemath
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
Summary: A free open-source mathematics software system
|
Summary: A free open-source mathematics software system
|
||||||
Version: 6.8
|
Version: 6.8
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
|
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
|
||||||
# Additionally, every $files section has a comment with the license name
|
# Additionally, every $files section has a comment with the license name
|
||||||
# before files with that license
|
# before files with that license
|
||||||
|
@ -115,7 +115,7 @@ Patch13: %{name}-cremona.patch
|
||||||
# lrslib is a requires
|
# lrslib is a requires
|
||||||
Patch14: %{name}-lrslib.patch
|
Patch14: %{name}-lrslib.patch
|
||||||
|
|
||||||
# nauty cannot be packaged due to license restrictions
|
# correct path to the nauty geng program
|
||||||
# http://cs.anu.edu.au/~bdm/nauty/
|
# http://cs.anu.edu.au/~bdm/nauty/
|
||||||
# http://pallini.di.uniroma1.it/
|
# http://pallini.di.uniroma1.it/
|
||||||
Patch15: %{name}-nauty.patch
|
Patch15: %{name}-nauty.patch
|
||||||
|
@ -208,6 +208,7 @@ BuildRequires: m4ri-devel
|
||||||
BuildRequires: m4rie-devel
|
BuildRequires: m4rie-devel
|
||||||
BuildRequires: maxima-runtime-ecl
|
BuildRequires: maxima-runtime-ecl
|
||||||
BuildRequires: mpfi-devel
|
BuildRequires: mpfi-devel
|
||||||
|
BuildRequires: nauty
|
||||||
BuildRequires: ntl-devel
|
BuildRequires: ntl-devel
|
||||||
BuildRequires: numpy
|
BuildRequires: numpy
|
||||||
BuildRequires: palp
|
BuildRequires: palp
|
||||||
|
@ -267,6 +268,7 @@ Requires: jsmath-fonts
|
||||||
Requires: lrslib-utils
|
Requires: lrslib-utils
|
||||||
Requires: maxima-gui
|
Requires: maxima-gui
|
||||||
Requires: maxima-runtime-ecl
|
Requires: maxima-runtime-ecl
|
||||||
|
Requires: nauty
|
||||||
Requires: palp
|
Requires: palp
|
||||||
Requires: pari-gp
|
Requires: pari-gp
|
||||||
Requires: python-crypto
|
Requires: python-crypto
|
||||||
|
@ -1500,6 +1502,10 @@ exit 0
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 29 2016 Jerry James <loganjerry@gmail.com> - 6.8-10
|
||||||
|
- Rebuild for ntl 9.8.0
|
||||||
|
- Nauty is now available under a free license
|
||||||
|
|
||||||
* Wed Apr 13 2016 Jerry James <loganjerry@gmail.com> - 6.8-9
|
* Wed Apr 13 2016 Jerry James <loganjerry@gmail.com> - 6.8-9
|
||||||
- Rebuild for linbox 1.4.1
|
- Rebuild for linbox 1.4.1
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue