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

[Evgeniy Alekseev]

    Date: Saturday, February 1, 2014 @ 22:21:17
  Author: arcanis
Revision: 105153

upgpkg: sage-mathematics 6.1-1

Modified:
  sage-mathematics/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-01 20:46:24 UTC (rev 105152)
+++ PKGBUILD	2014-02-01 21:21:17 UTC (rev 105153)
@@ -8,8 +8,8 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=6.0
-pkgrel=2
+pkgver=6.1
+pkgrel=1
 pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
 url="http://www.sagemath.org"
@@ -26,7 +26,7 @@
         "fix-pil.patch"
         "sage.service")
 install="${pkgname}.install"
-md5sums=('da1bacf90fc291e736aaa71431e8874e'
+md5sums=('75130374fcdb9395955db81f1ed28422'
          'de54cb818d74c070a524fc3fd5208b2c'
          '985da1c1d1dcdc3ea9aa73035cb7996b')
 
@@ -51,21 +51,6 @@
   mkdir "${srcdir}/build"
   
   # according to FS#34769
-  # NOTE: there is an error in pil build (freetype/fterrors.h not found)
-  cd "${srcdir}/sage-${pkgver}/upstream/"
-  tar xjfv pil-1.1.6.tar.bz2
-  rm -r pil-1.1.6.tar.bz2
-  patch -p0 -i "${srcdir}/fix-pil.patch"
-  tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6
-  rm -rf pil-1.1.6
-  # fix checksums
-  SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}')
-  sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
-  # disable freetype build
   rm -rf freetype-*
   sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install"
 }
@@ -100,7 +85,6 @@
   # only build sage, no documents
   #make build
   make
-  ./sage --bdist "${pkgver}"
 }
 
 << COMMENT
@@ -115,24 +99,19 @@
 COMMENT
 
 package() {
-  cd "sage-${pkgver}"
+  cd "${srcdir}/sage-${pkgver}/"
+  # remove build logs
+  rm -f *.log
+  rm -rf spkg/{base,build,logs,standarts}
   
   # cp because make install is experimental and will corrupt the install
   install -d "${pkgdir}/opt/sage"
-  cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/"
+  cp -r * "${pkgdir}/opt/sage/"
   
   # move SageTeX files to more appropriate directory
   install -d "${pkgdir}/usr/share"
   mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
   
-  # remove build logs
-  rm -f "${pkgdir}/opt/sage/*.log"
-  rm -rf "${pkgdir}/opt/sage/spkg/logs"
-  
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  rm -f "${pkgdir}/opt/sage/spkg/base/*spkg"
-  rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg"
-  
   # according to FS#37090
   # install scripts
   install -d "${pkgdir}/usr/bin"