Make enroot-git package a standard "-git" package

Now, there are two packages:
* enroot     - latest tagged version (updated manually by pkg owner)
* enroot-git - master branch (can be triggered at any time by AUR users)

2 files changed, 18 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a230710a5f77..b34d75941305 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = enroot
+pkgbase = enroot-git
 	pkgdesc = A simple yet powerful tool to turn traditional container/OS images into unprivileged sandboxes.
 	pkgver = 2.2.0
-	pkgrel = 2
+	pkgrel = 1
 	url = https://github.com/NVIDIA/enroot
 	install = enroot.install
 	arch = x86_64
@@ -18,9 +18,11 @@ pkgbase = enroot
 	optdepends = pigz
 	optdepends = pv
 	optdepends = squashfuse
+	provides = enroot
+	conflicts = enroot
 	backup = etc/enroot/enroot.conf
-	source = git+https://github.com/NVIDIA/enroot.git#tag=v2.2.0
+	source = git+https://github.com/NVIDIA/enroot.git#branch=master
 	sha256sums = SKIP
 
-pkgname = enroot
+pkgname = enroot-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f0e22682de3..53f896cc7b97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
-pkgname='enroot'
+pkgname='enroot-git'
 pkgver=2.2.0
-pkgrel=2
+pkgrel=1
 pkgdesc='A simple yet powerful tool to turn traditional container/OS images into unprivileged sandboxes.'
 url='https://github.com/NVIDIA/enroot'
 arch=(x86_64)
@@ -8,10 +8,18 @@ license=(BSD)
 makedepends=(git gcc make libtool)
 depends=(jq parallel squashfs-tools)
 optdepends=(fuse-overlayfs-git libnvidia-container-tools pigz pv squashfuse)
+conflicts=(enroot)
+provides=(enroot)
 install='enroot.install'
-source=("git+https://github.com/NVIDIA/enroot.git#tag=v${pkgver}")
+source=("git+https://github.com/NVIDIA/enroot.git#branch=master")
 sha256sums=(SKIP)
 
+pkgver() {
+  cd enroot
+  # Remove leading "v"; add "r" before commit count; convert dashes to dots.
+  git describe --long --tags | sed 's/^v// ; s/\([^-]*-g\)/r\1/ ; s/-/./g'
+}
+
 build() {
   cd 'enroot'
   CPPFLAGS="-DALLOW_SPECULATION -DINHERIT_FDS" make prefix='' exec_prefix=/usr datarootdir=/usr/share
@@ -21,7 +29,7 @@ package() {
   cd 'enroot'
   DESTDIR="$pkgdir/" make install prefix='' exec_prefix=/usr datarootdir=/usr/share
   mkdir -p "${pkgdir}/usr/share/bash-completion/completions"
-  mv "${pkgdir}/usr/share/enroot/enroot.bash_completion" "${pkgdir}/usr/share/bash-completion/completions/enroot"
+  mv "${pkgdir}/usr/share/enroot/bash_completion" "${pkgdir}/usr/share/bash-completion/completions/enroot"
 }
 
 backup=(etc/enroot/enroot.conf)