[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, January 4, 2015 @ 00:37:33
  Author: arojas
Revision: 125262

Another round of fixes
- Add missing python2-networkx dependency
- Remove bogus warning message about missing GAP
- Force using small Cremona database
- Fix cblas linking in cython code
- One more python -> python2 fix
- Add c_lib include files in src subpackage, needed to compile cython code

Modified:
  sage-mathematics/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-03 23:35:24 UTC (rev 125261)
+++ PKGBUILD	2015-01-03 23:37:33 UTC (rev 125262)
@@ -10,7 +10,7 @@
 pkgbase=sage-mathematics
 pkgname=('sage-mathematics' 'sage-mathematics-src')
 pkgver=6.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
@@ -17,7 +17,8 @@
 license=('GPL')
 makedepends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'polybori' 'singular' 'libcliquer' 'ecl' 'libgap' 'givaro' 'libmpc' 'lcalc' 'lrcalc' 'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'pynac' 'linbox' 'gsl' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'gd' 'python2-jinja' 'python2-numpy')
 source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" 
-'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch' 'gap-hap.patch' 'pexpect-env.patch' 'fes02.patch')
+'extensions.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch' 'gap-hap.patch' 
+'pexpect-env.patch' 'fes02.patch')
 md5sums=('e40736461992e62af3a84cf9a212c9d1'
          'd9a3e113ed147dcee8f89962a8dccd43'
          '5770766ae676491f79162d2062ce7c02'
@@ -44,9 +45,9 @@
 # don't assume Sage is already available (Fedora)
   patch -p0 -i $srcdir/c_lib.patch
 # find L.h header
-  sed -i 's|libLfunction|Lfunction|' src/module_list.py
+  sed -e 's|libLfunction|Lfunction|' -i src/module_list.py
 # don't try to link against libpng 1.2
-  sed -i 's|png12|png|' src/module_list.py
+  sed -e 's|png12|png|' -i src/module_list.py
 # set env variables
   patch -p0 -i $srcdir/env.patch
 # fix paths in python imports
@@ -53,6 +54,7 @@
   patch -p0 -i $srcdir/paths.patch
 # fix linking to blas/cblas
   patch -p0 -i $srcdir/blas.patch
+  sed -e "s|cblas(), atlas(),|'cblas', 'blas',|" -i src/sage/misc/cython.py
 # don't try to remove installed files
   patch -p0 -i $srcdir/clean.patch
 # skip checking build status
@@ -59,13 +61,18 @@
   patch -p0 -i $srcdir/skip-check.patch
 # don't use is_package_installed function
   patch -p0 -i $srcdir/gap-hap.patch
-# fix build against libfes 0.2
-  patch -p0 -i $srcdir/fes02.patch # http://trac.sagemath.org/ticket/15209
+# supress warning about GAP install dir
+  sed -e "s|gapdir = os.path.join(SAGE_LOCAL, 'gap', 'latest')|gapdir = '/usr/lib/gap'|" -i src/sage/libs/gap/util.pyx 
+# use small Cremona database
+  sed -e "s|is_package_installed('database_cremona_ellcurve')|False|" -i src/sage/databases/cremona.py
+# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
+  patch -p0 -i $srcdir/fes02.patch
 
 # use python2
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' src/bin/*
-  sed -i 's|exec python|exec python2|' src/bin/*
-  sed -i 's|cython %s %s|cython2 %s %s|' src/sage/misc/cython.py
+  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i src/bin/*
+  sed -e 's|exec python|exec python2|' -i src/bin/*
+  sed -e 's|cython %s %s|cython2 %s %s|' -i src/sage/misc/cython.py
+  sed -e 's|python setup.py|python2 setup.py|' -i src/sage/misc/cython.py
 
 # fix env in pexpect
   cd $srcdir/pexpect-2.0
@@ -94,8 +101,10 @@
 
 
 package_sage-mathematics() {
-  depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2' 
-  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes' 'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small' 'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials') # python2-pexpect
+  depends=('ipython2' 'cython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
+  'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc' 'lrcalc' 'libfes'
+  'cryptominisat' 'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
+  'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials')
   optdepends=('jmol: 3D plots' 'sage-notebook: Web-based notebook interface' 'sage-mathematics-doc: Documentation and inline help'
   'sage-mathematics-src: source files needed to build cython code'
   'python2-pyzmq: ipython notebook' 'python2-tornado: ipython notebook' 'python2-jinja: ipython notebook')
@@ -131,4 +140,7 @@
   
   mkdir -p "$pkgdir"/usr/share/sage/src
   cp -r sage-$pkgver/src/sage "$pkgdir"/usr/share/sage/src
+
+  mkdir -p "$pkgdir"/usr/include/csage
+  cp -r sage-$pkgver/src/c_lib/include/* "$pkgdir"/usr/include/csage
 }