Track main; use internal version number until git describe correct

2 files changed, 19 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 419058aadbac..3cd9c691ea6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chapel-git
 	pkgdesc = Programming language designed for productive parallel computing at scale
-	pkgver = 1.26.cc0241ef9c
+	pkgver = 1.27.0.7648.gbcc4ac3109
 	pkgrel = 1
 	url = https://chapel-lang.org/
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = chapel-git
 	depends = perl
 	depends = llvm
 	depends = clang
-	source = git+https://github.com/mppf/chapel.git
+	source = git+https://github.com/chapel-lang/chapel.git
 	sha256sums = SKIP
 
 pkgname = chapel-git
diff --git a/PKGBUILD b/PKGBUILD
index c5a08f16a0e2..e13df6b7813e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,11 @@
 
 # Maintainer: Gabriel Brown <gabriel.h.brown@gmail.com>
 
-#_gituser="chapel-lang"
-_gituser="mppf" #temp: until PR #19913 is merged
+_gituser="chapel-lang"
 _gitname="chapel"
 
 pkgname=${_gitname}-git
-_basepkgver=1.26
-pkgver=1.26.cc0241ef9c
+pkgver=1.27.0.7648.gbcc4ac3109
 pkgrel=1
 pkgdesc="Programming language designed for productive parallel computing at scale"
 url="https://chapel-lang.org/"
@@ -20,12 +18,25 @@ sha256sums=('SKIP') # source is not static
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
-  git describe --long --tags --always | sed 's/\-/\./' | echo "${_basepkgver}.$(cat -)"
+  # get correct numerical version from internal file
+  ver_file="compiler/main/version_num.h"
+  major_ver=$(grep MAJOR_VERSION  ${ver_file} | cut -d ' ' -f 3) 
+  minor_ver=$(grep MINOR_VERSION  ${ver_file} | cut -d ' ' -f 3) 
+  update_ver=$(grep UPDATE_VERSION ${ver_file} | cut -d ' ' -f 3) 
+  ver_num="${major_ver}.${minor_ver}.${update_ver}"
+  # keep second (correct) half of git describe result
+  gitdescribe=$(git describe --long --tags --always)
+  tail=$(echo ${gitdescribe} | cut -d '-' -f 2,3) # no version number
+  # combine two pieces
+  ver_hyphen="${ver_num}-${tail}"
+  ver=$(echo ${ver_hyphen} | sed 's/\-/\./g')
+  echo ${ver}
+  # use below when git describe begins with correct version number
+  #git describe --long --tags --always | sed 's/\-/\./g' 
 }
 
 build() {
         cd "${srcdir}/${_gitname}"
-        git checkout less-la #temp: until PR #19913 is merged
         ./configure --prefix=/usr
         make
 }