Update to 1.5.0

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd15282dd031..059d4fc031e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 # Generated by mksrcinfo v8
-# Sun Oct  2 21:20:52 UTC 2016
+# Sun Oct  2 21:26:38 UTC 2016
 pkgbase = yacas
 	pkgdesc = Yet another computer algebra system
-	pkgver = 1.4.0
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = http://www.yacas.org/
 	install = yacas.install
 	arch = i686
 	arch = x86_64
 	groups = mathematics
-	license = GPL
+	license = GPL2
 	makedepends = gcc
 	makedepends = perl
 	makedepends = imagemagick
+	makedepends = python-sphinx
 	depends = glibc
 	depends = gcc-libs
 	optdepends = gnuplot
@@ -20,11 +21,11 @@ pkgbase = yacas
 	optdepends = texmacs
 	optdepends = fbreader: Reading EPUB manual
 	noextract = yacas.epub
-	source = https://github.com/grzegorzmazur/yacas/archive/v1.4.0.tar.gz
+	source = yacas-1.5.0.tar.gz::https://github.com/grzegorzmazur/yacas/archive/v1.5.0.tar.gz
 	source = https://media.readthedocs.org/epub/yacas/latest/yacas.epub
 	source = yacas.desktop
 	source = yacas-docs.desktop
-	md5sums = 80b86a586d8d56afdd6986686daf0f13
+	md5sums = 0745ff1f7d7c4520b40054deb16801f9
 	md5sums = SKIP
 	md5sums = 21d4cf6e7658aa0d7c4a0ed14c13f2e9
 	md5sums = fff8c43f7ab3a77c6f6e181bc3e2687f
diff --git a/PKGBUILD b/PKGBUILD
index dfaf33b53cc1..e0355ad12b92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,25 @@
 # Maintainer : Marcos Heredia <chelqo@gmail.com>
 
 pkgname=yacas
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=1
 pkgdesc='Yet another computer algebra system'
 url='http://www.yacas.org/'
 screenshot='https://dl.dropbox.com/s/dy9evnpl13kdo21/yacas-console.png'
-license=('GPL')
+license=('GPL2')
 groups=("mathematics")
 arch=('i686' 'x86_64')
 depends=('glibc' 'gcc-libs')
 optdepends=('gnuplot' 'lynx' 'texmacs' 'fbreader: Reading EPUB manual')
-makedepends=('gcc' 'perl' 'imagemagick' ) #'python3-sphinx')
+makedepends=('gcc' 'perl' 'imagemagick' 'python-sphinx')
 install=${pkgname}.install
 noextract=('yacas.epub')
-source=("https://github.com/grzegorzmazur/yacas/archive/v${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/grzegorzmazur/yacas/archive/v${pkgver}.tar.gz"
         'https://media.readthedocs.org/epub/yacas/latest/yacas.epub'
         'yacas.desktop'
         'yacas-docs.desktop'
         )
-md5sums=('80b86a586d8d56afdd6986686daf0f13'  # yacas source
+md5sums=('0745ff1f7d7c4520b40054deb16801f9'  # yacas source
          'SKIP'                              # Epub manual
          '21d4cf6e7658aa0d7c4a0ed14c13f2e9'  # yacas.desktop
          'fff8c43f7ab3a77c6f6e181bc3e2687f'  # yacas-docs.desktop
@@ -35,19 +35,17 @@ build() {
   cd build
   msg "### cmake" ; cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_DOCS=ON \
     -DCMAKE_BUILD_TYPE=Release
   msg "### make"  ; make
 
-#    -DENABLE_OLD_DOCS=yes \
-#    -DENABLE_DOCS=ON \
 #    -DENABLE_JYACAS=yes \
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}/build
-  cat cmake_install.cmake | grep -v "share/doc" >cmake_install.cmake.tmp
-  mv cmake_install.cmake.tmp cmake_install.cmake
   msg "### instalation " ; make DESTDIR=$pkgdir install
+  rm -rf ${pkgdir}/usr/share/doc/${pkgname}
   cd ..
   _appdir=${pkgdir}/usr/share/applications
   _pngdir=${pkgdir}/usr/share/pixmaps
@@ -57,7 +55,7 @@ package() {
   install -Dpm644 ${startdir}/yacas.desktop ${_appdir}/
   install -Dpm644 ${startdir}/yacas-docs.desktop ${_appdir}/
   convert -crop 500x500+34+110 docs/yacaslogo.png ${_pngdir}/yacas.png
-  install -Dpm644 AUTHORS ChangeLog INSTALL NEWS README* TODO ${_docdir}/
+  install -Dpm644 AUTHORS INSTALL NEWS README* TODO build/changelog.gz packaging/deb/copyright ${_docdir}/
   install -Dpm644 ${srcdir}/yacas.epub ${pkgdir}/usr/share/yacas/
   install -Dpm644 COPYING ${_licdir}/
   (cd ${_docdir} ; ln -s ../../yacas/yacas.epub .)