makedeb


simh-git 4.0b1+3088+g5ded4f2c-1


The Computer History Simulation Project

Click here to go back to the commit logs for simh-git.

Commit:


Hash: e767bc808717ee98a55be33ccda5cb65e3318528

Message: Fix pkgver generation

Diff


diff --git a/.SRCINFO b/.SRCINFO
index 5dede30..30fdaa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,8 +2,8 @@ generated-by = makedeb
 pkgname = simh-git
 pkgbase = simh-git
 pkgdesc = The Computer History Simulation Project
-pkgrel = 2
-pkgver = 4.0b1+g16943b4
+pkgrel = 1
+pkgver = 4.0b1+3088+g5ded4f2c
 url = http://simh.trailing-edge.com/
 arch = i386
 arch = amd64
diff --git a/PKGBUILD b/PKGBUILD
index a9f94a9..e70f25b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,8 @@
 # Contributor: R. van Elst <https://raymii.org>
 
 pkgname="simh-git"
-#pkgver=4.0b1+2715+g6728b3f4
-pkgver=4.0b1+g16943b4
-pkgrel=2
+pkgver=4.0b1+3088+g5ded4f2c
+pkgrel=1
 pkgdesc="The Computer History Simulation Project"
 arch=('i386' 'amd64')
 url="http://simh.trailing-edge.com/"
@@ -18,8 +17,9 @@ source=('git+https://github.com/simh/simh.git')
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname%-*}"
-  printf "4.0b1+g%s" "$(git describe --long --tags --always | sed 's/v//; s/-/./g')"
+  cd "../${pkgname%-*}"
+  git fetch --unshallow || git fetch --all
+  git describe --long --tags | sed 's/v//; s/-Beta-/b/; s/-/+/g'
 }
 
 build() {