Limit git rev-parse to 7 chars and move deps to package().

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdec667d21b6..04988a4c3f13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = netns-helper-git
 	pkgdesc = Helper systemd services to create network namespaces for other programs and services.
-	pkgver = r77.123b803
+	pkgver = r81.a8ae0ab
 	pkgrel = 1
 	url = https://gitlab.com/patlefort/netns-helper
 	arch = any
@@ -9,8 +9,6 @@ pkgbase = netns-helper-git
 	makedepends = libxslt
 	makedepends = docbook-xsl-ns
 	makedepends = cmake
-	depends = systemd
-	depends = iproute2
 	optdepends = nftables: nat feature
 	optdepends = bash-completion
 	optdepends = dnsmasq: DNS support
@@ -23,3 +21,5 @@ pkgbase = netns-helper-git
 	sha256sums = SKIP
 
 pkgname = netns-helper-git
+	depends = systemd
+	depends = iproute2
diff --git a/PKGBUILD b/PKGBUILD
index 6340e802bc77..65b409d19a5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@ _pkgname=netns-helper
 pkgname=${_pkgname}-git
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-pkgver=r77.123b803
+pkgver=r81.a8ae0ab
 pkgrel=1
 pkgdesc='Helper systemd services to create network namespaces for other programs and services.'
 url="https://gitlab.com/patlefort/${_pkgname}"
 license=('GPL3')
-depends=('systemd' 'iproute2')
+depends=()
 arch=('any')
 optdepends=(
 	'nftables: nat feature'
@@ -25,8 +25,8 @@ options=('!strip')
 pkgver() {
 	cd "${_pkgname}"
 	( set -o pipefail
-		git describe --abbrev=7 --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+		git describe --tags --abbrev=7 --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 	)
 }
 
@@ -36,6 +36,8 @@ build() {
 }
 
 package() {
+	depends=('systemd' 'iproute2')
+	
 	DESTDIR="${pkgdir}" cmake --install 'build'
 	
 	install -dm755 "${pkgdir}/etc/netns-helper/ns"