summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Aznarán Laos2022-11-01 22:36:23 -0500
committerCarlos Aznarán Laos2022-11-01 22:36:23 -0500
commit2f554aa97babdf3eec1ed0dffe9ad7b942148a4b (patch)
treeb0025e8229de4d2e6cdd68741c28f117ab8aa568
parent99fa75db567fdb54e2a6c6e9b41bcb4f61856bb2 (diff)
downloadaur-2f554aa97babdf3eec1ed0dffe9ad7b942148a4b.tar.gz
Improve pkgver() function
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1cb5a70bdda3..77ce8f575835 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = petsc-git
pkgdesc = Portable, extensible toolkit for scientific computation
- pkgver = 3.18.1.24.g1f6a6395d11
+ pkgver = 3.18.1.r24.g1f6a6395d11
pkgrel = 1
url = https://petsc.org
install = petsc.install
@@ -43,8 +43,8 @@ pkgbase = petsc-git
optdepends = suitesparse: Sparse matrix library
optdepends = superlu: Subroutines for sparsse linear systems
optdepends = libyaml: configuration files
- provides = petsc=3.18.1.24.g1f6a6395d11
- provides = petsc4py=3.18.1.24.g1f6a6395d11
+ provides = petsc=3.18.1
+ provides = petsc4py=3.18.1
conflicts = petsc
options = staticlibs
source = git+https://gitlab.com/petsc/petsc.git#branch=release
diff --git a/PKGBUILD b/PKGBUILD
index 1c0ae21796e0..332dfc50c067 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_base=petsc
pkgname=${_base}-git
-pkgver=3.18.1.24.g1f6a6395d11
+pkgver=3.18.1.r24.g1f6a6395d11
pkgrel=1
_config=linux-c-opt
# if --with-debugging=yes is set then PETSC_ARCH is automatically set to
@@ -113,7 +113,7 @@ export PETSC_ARCH=${_config}
pkgver() {
cd "${srcdir}"/"${_base}"
- git describe --tags --match '*.*' | tr '-' '.' | sed 's-^v--'
+ git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {