zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 5.12

Browse source
This commit is contained in:
pcpa 2013-10-18 23:22:11 -03:00
parent 4f797f23e1
commit d4a07df7d0
37 changed files with 281 additions and 843 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sagemath-rpmbuild.patch
View file

@ -1,6 +1,6 @@
diff -up sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install
--- sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig 2013-07-29 19:43:09.049027449 -0300
+++ sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install 2013-07-29 19:43:39.434028612 -0300
diff -up sage-5.12/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig sage-5.12/spkg/build/conway_polynomials-0.4.p0/spkg-install
--- sage-5.12/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig 2013-10-16 11:55:08.703164600 -0300
+++ sage-5.12/spkg/build/conway_polynomials-0.4.p0/spkg-install 2013-10-16 11:55:11.351164701 -0300
@@ -2,9 +2,10 @@
import os
@ -14,9 +14,9 @@ diff -up sage-5.10/spkg/build/conway_polynomials-0.4.p0/spkg-install.orig sage-5
def create_db():
db = {}
diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 19:43:09.023027448 -0300
+++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 19:44:52.051031393 -0300
diff -up sage-5.12/spkg/build/sage-5.12/module_list.py.orig sage-5.12/spkg/build/sage-5.12/module_list.py
--- sage-5.12/spkg/build/sage-5.12/module_list.py.orig 2013-10-16 11:54:46.324163743 -0300
+++ sage-5.12/spkg/build/sage-5.12/module_list.py 2013-10-16 11:55:11.353164701 -0300
@@ -5,7 +5,7 @@ from distutils.core import setup
from distutils.extension import Extension
from sage.env import *
@ -49,7 +49,7 @@ diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build
polybori_major_version = '0.8'
@@ -653,7 +654,7 @@ ext_modules = [
@@ -672,7 +673,7 @@ ext_modules = [
sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'],
libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx',
'Lfunction', 'stdc++'],
@ -58,12 +58,15 @@ diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build
extra_compile_args=["-O3", "-ffast-math"],
language = 'c++'),
diff -up sage-5.10/spkg/build/sage-5.10/setup.py.orig sage-5.10/spkg/build/sage-5.10/setup.py
--- sage-5.10/spkg/build/sage-5.10/setup.py.orig 2013-07-29 19:43:09.041027448 -0300
+++ sage-5.10/spkg/build/sage-5.10/setup.py 2013-07-29 19:48:14.195039134 -0300
@@ -38,21 +38,11 @@ except KeyError:
diff -up sage-5.12/spkg/build/sage-5.12/setup.py.orig sage-5.12/spkg/build/sage-5.12/setup.py
--- sage-5.12/spkg/build/sage-5.12/setup.py.orig 2013-10-18 11:46:06.182555124 -0300
+++ sage-5.12/spkg/build/sage-5.12/setup.py 2013-10-18 11:46:29.092556002 -0300
@@ -36,23 +36,13 @@ except KeyError:
compile_result_dir = None
keep_going = False
SAGE_INC = os.path.join(SAGE_LOCAL,'include')
-SAGE_INC = os.path.join(SAGE_LOCAL,'include')
+SAGE_INC = '/usr/include'
-SITE_PACKAGES = '%s/lib/python%s/site-packages/'%(SAGE_LOCAL,platform.python_version().rsplit('.', 1)[0])
-if not os.path.exists(SITE_PACKAGES):
@ -104,7 +107,7 @@ diff -up sage-5.10/spkg/build/sage-5.10/setup.py.orig sage-5.10/spkg/build/sage-
m.extra_compile_args += extra_compile_args
m.extra_link_args += extra_link_args
- m.library_dirs += ['%s/lib' % SAGE_LOCAL]
+ m.library_dirs += ['@@libdir@@/atlas', 'c_lib', '%s/lib' % SAGE_LOCAL]
+ m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL]