git » aubio.git » commit f08ef74

Being more explicit during package().

author David Runge
2018-02-19 00:35:42 UTC
committer David Runge
2018-02-19 00:35:42 UTC
parent 21f7f3937a560a04861f7b4f00d9b1f6ad4f09b7

Being more explicit during package().

Adding pkgdesc for split packages. Minor fixes.

PKGBUILD +12 -8

diff --git a/PKGBUILD b/PKGBUILD
index 6544ba2..a4ce09a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,7 @@
 pkgbase=aubio
 pkgname=('aubio' 'python-aubio' 'python2-aubio')
 pkgver=0.4.6
-pkgrel=2
-pkgdesc="A tool for extracting annotations from audio signals"
+pkgrel=3
 arch=('x86_64')
 url="https://aubio.org/"
 license=('GPL3')
@@ -22,7 +21,9 @@ prepare() {
   cp -av "${pkgname[0]}-${pkgver}" "${pkgname[2]}-${pkgver}"
   cd "${pkgname[2]}-${pkgver}"
   # python2 shebang
-  sed -e '1s/python/&2/' -i "python/lib/${pkgname}/"{__init__,cmd,cut}.py -i "python/tests/"*.py
+  sed -e '1s/python/&2/' \
+    -i "python/lib/${pkgname}/"{__init__,cmd,cut}.py \
+    -i "python/tests/"*.py
 }
 
 build() {
@@ -50,37 +51,40 @@ check() {
 }
 
 package_aubio() {
+  pkgdesc="A tool for extracting annotations from audio signals"
   depends=('ffmpeg' 'fftw' 'jack' 'libsamplerate' 'libsndfile')
   optdepends=('python2-numpy: Python 2.x interface'
               'python-numpy: Python 3.x interface')
   cd "${pkgname[0]}-${pkgver}"
   python2 waf --destdir="${pkgdir}" install
   # move doc, as waf configure doesn't honor the htmldir and docdir settings
-  mv -v "${pkgdir}/usr/share/doc/lib${pkgname}-doc" \
-    "${pkgdir}/usr/share/doc/${pkgname}"
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/" \
+  mv -v "${pkgdir}/usr/share/doc/lib${pkgname[0]}-doc" \
+    "${pkgdir}/usr/share/doc/${pkgname[0]}"
+  install -t "${pkgdir}/usr/share/doc/${pkgname[0]}/" \
     -vDm644 {AUTHORS,ChangeLog,README.md}
 }
 
 package_python-aubio() {
+  pkgdesc="Python 3.x bindings for aubio."
   depends=('aubio' 'python-numpy')
   cd "${pkgname[1]}-${pkgver}"
   python setup.py install --skip-build \
     --optimize=1 \
     --prefix=/usr \
     --root="${pkgdir}"
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/" \
+  install -t "${pkgdir}/usr/share/doc/${pkgname[1]}/" \
     -vDm644 {AUTHORS,ChangeLog,README.md}
 }
 
 package_python2-aubio() {
+  pkgdesc="Python 2.x bindings for aubio."
   depends=('aubio' 'python2-numpy')
   cd "${pkgname[2]}-${pkgver}"
   python2 setup.py install --skip-build \
     --optimize=1 \
     --prefix=/usr \
     --root="${pkgdir}"
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/" \
+  install -t "${pkgdir}/usr/share/doc/${pkgname[1]}/" \
     -vDm644 {AUTHORS,ChangeLog,README.md}
   # move duplicates
   mv -v ${pkgdir}/usr/bin/aubio ${pkgdir}/usr/bin/aubio2