aria2: Some updates

Move autoreconf into prepare

2 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb861a48eac7..4df62070918b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aria2-git
 	pkgdesc = Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink
-	pkgver = 1.22.0.30.ge174b90
-	pkgrel = 2
+	pkgver = 1.34.0.r21.g37368130
+	pkgrel = 1
 	url = http://aria2.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -15,7 +15,7 @@ pkgbase = aria2-git
 	depends = c-ares
 	depends = ca-certificates
 	depends = libssh2
-	provides = aria2=1.22.0.30
+	provides = aria2=1.34.0.r21
 	conflicts = aria2
 	source = aria2-git::git+https://github.com/tatsuhiro-t/aria2.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a23edbc6394a..b8521ea04ce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Thomas Berryhill (oats) <tb01110100 at gmail dot com>
+# Maintainer: Lex Black <autumn-wind@web.de>
+# Contributor: Thomas Berryhill (oats) <tb01110100 at gmail dot com>
 # Contributor: Felix Yan <felixonmars at archlinux dot org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux dot org>
 # Contributor: Thomas Dziedzic <gostrc at gmail dot com>
@@ -7,29 +8,34 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux dot us>
 
 pkgname=aria2-git
-pkgver=1.22.0.30.ge174b90
-pkgrel=2
+pkgver=1.34.0.r21.g37368130
+pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
 url='http://aria2.sourceforge.net/'
 license=('GPL')
-conflicts=('aria2')
-provides=("aria2=${pkgver%.*}")
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates' 'libssh2')
 makedepends=('git' 'python2-sphinx')
 checkdepends=('cppunit')
+conflicts=('aria2')
+provides=("aria2=${pkgver%.*}")
 source=("$pkgname::git+https://github.com/tatsuhiro-t/aria2.git")
 sha256sums=('SKIP')
 
+
 pkgver() {
   cd "$pkgname"
-  git describe --always | sed -e 's/-/./g' -e 's/release.//'
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/release.//'
+}
+
+prepare() {
+  cd "$pkgname"
+  autoreconf -i
 }
 
 build() {
   cd "$pkgname"
 
-  autoreconf -i
   ./configure \
     --prefix=/usr \
     --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@@ -38,7 +44,6 @@ build() {
 
 check() {
   cd "$pkgname"
-
   make check
 }