misc changes/improvements

1 files changed, 16 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 27d4551bfbd7..833d8e241b14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,40 +8,39 @@ pkgdesc='NTU CEIBA data downloader /  NTU CEIBA 資料下載工具'
 arch=(i686 x86_64)
 license=(LGPL3)
 url='https://github.com/lantw44/ceiba-dl'
-depends=(python-lxml python-pycurl python-xdg 'webkit2gtk>=2.20')
-makedepends=(autoconf-archive git)
-source=('git+https://github.com/lantw44/ceiba-dl')
-sha256sums=('SKIP')
+depends=('python-lxml' 'python-pycurl' 'python-xdg' 'webkit2gtk>=2.20')
+makedepends=('autoconf-archive' 'git')
 conflicts=("$_pkgname")
 provides=("$_pkgname=$pkgver")
+source=('git+https://github.com/lantw44/ceiba-dl')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
+  cd $_pkgname
   ( set -o pipefail
-    git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
   )
 }
 
 prepare() {
-    cd "$srcdir/$_pkgname"
+  cd $_pkgname
 
-    NOCONFIGURE=1 ./autogen.sh
+  autoreconf -ifv
 }
 
 build() {
-    cd "$srcdir/$_pkgname"
+  cd $_pkgname
 
-    # The default is --enable-compile-warnings=error, which breaks the build
-    ./configure \
-        --prefix=/usr \
-        --enable-compile-warnings=yes
+  # The default is --enable-compile-warnings=error, which breaks the build
+  ./configure \
+    --prefix=/usr \
+    --enable-compile-warnings=yes
 
-    make
+  make
 }
 
 package() {
-    cd "$srcdir/$_pkgname"
+  cd $_pkgname
 
-    make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 }