Update source URL and pkgver() function

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 566fb6c0eb70..9d9f947b1e80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amule-daemon-git
 	pkgdesc = An eMule-like client for the eD2k and Kademlia p2p networks (daemon only, development version)
-	pkgver = head
-	pkgrel = 2
+	pkgver = latest
+	pkgrel = 4
 	url = http://www.amule.org
 	install = amule-daemon-git.install
 	arch = i686
@@ -11,7 +11,7 @@ pkgbase = amule-daemon-git
 	depends = crypto++
 	depends = wxbase>=2.8
 	conflicts = amule
-	source = git+git://repo.or.cz/amule.git
+	source = git+git://github.com/amule-project/amule.git
 	source = amuled.service
 	source = amuled@.service
 	source = amuled.tmpfile
diff --git a/PKGBUILD b/PKGBUILD
index d6cba9ded315..3f9539e077a7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=amule-daemon-git
 pkgver=latest
-pkgrel=3
+pkgrel=4
 pkgdesc='An eMule-like client for the eD2k and Kademlia p2p networks (daemon only, development version)'
 url='http://www.amule.org'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ license=('GPL')
 depends=('crypto++' 'wxbase>=2.8')
 makedepends=('git')
 conflicts=('amule')
-source=('git+git://repo.or.cz/amule.git'
+source=('git+git://github.com/amule-project/amule.git'
         'amuled.service'
         'amuled@.service'
         'amuled.tmpfile')
@@ -21,13 +21,16 @@ md5sums=('SKIP'
 install="amule-daemon-git.install"
 
 pkgver() {
-  cd amule
-  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd ${srcdir}/amule
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 build() {
-  cd amule
-  ./configure \
+  cd ${srcdir}/amule
+  ./autogen.sh && ./configure \
       --prefix=/usr \
       --mandir=/usr/share/man \
       --disable-monolithic \