1.15.4.r2

2 files changed, 12 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2275fc6661fd..ae583cd66d63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cowsql-git
 	pkgdesc = An embeddable and replicated SQLite engine with high availability & automatic failover
-	pkgver = 1.15.3.r0.ga1d49d0
+	pkgver = 1.15.4.r2.g6c91a1b
 	pkgrel = 1
 	url = https://github.com/cowsql/cowsql
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = cowsql-git
 	depends = libuv
 	depends = raft
 	depends = sqlite
-	provides = cowsql
+	provides = cowsql=1.15.4
 	conflicts = cowsql
 	options = strip
 	source = cowsql::git+https://github.com/cowsql/cowsql.git
diff --git a/PKGBUILD b/PKGBUILD
index e149637bb83b..9e73af6a9755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname="cowsql"
 pkgname="$_pkgname-git"
-pkgver=1.15.3.r0.ga1d49d0
+pkgver=1.15.4.r2.g6c91a1b
 pkgrel=1
 pkgdesc='An embeddable and replicated SQLite engine with high availability & automatic failover'
 url="https://github.com/cowsql/cowsql"
@@ -25,29 +25,17 @@ makedepends=(
 
 options=(strip)
 
-if [ x"$pkgname" == x"$_pkgname" ] ; then
-  # normal package
-  _pkgsrc="$_pkgname"
-  source+=("$_pkgsrc"::"git+$url.git#tag=v${pkgver%%.r*}")
-  sha256sums+=('SKIP')
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
 
-  pkgver() {
-    echo "${pkgver%%.r*}"
-  }
-else
-  # git package
-  provides=("$_pkgname")
-  conflicts=("$_pkgname")
+_pkgsrc="$_pkgname"
+source+=("$_pkgsrc"::"git+$url.git")
+sha256sums+=('SKIP')
 
-  _pkgsrc="$_pkgname"
-  source+=("$_pkgsrc"::"git+$url.git")
-  sha256sums+=('SKIP')
-
-  pkgver() {
-    cd "$_pkgsrc"
-    git describe --long --tags --exclude='*[a-zA-Z][a-zA-Z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
-  }
-fi
+pkgver() {
+  cd "$_pkgsrc"
+  git describe --long --tags --exclude='*[a-zA-Z][a-zA-Z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+}
 
 build() {
   local _configure_options=(