summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO3
-rw-r--r--ChangeLog6
-rw-r--r--PKGBUILD34
3 files changed, 23 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 379d5382963b..35e66bae5071 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = return-to-the-roots-git
pkgdesc = Free/libre implementation of The Settlers II game engine
- pkgver = r5113.85a6b9941
+ pkgver = v0.9.1.120.g83c6f815c
pkgrel = 1
url = https://siedler25.org/
install = return-to-the-roots.install
@@ -61,4 +61,3 @@ pkgbase = return-to-the-roots-git
sha256sums = 888a1cd55350971ec3660de79c82760be63ed40617e8ef6931c20b07bc73e1a9
pkgname = return-to-the-roots-git
-
diff --git a/ChangeLog b/ChangeLog
index 4c3749c7fd78..6ac12bcad7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2022-02-03 Pierre Choffet <peuc@wanadoo.fr>
+ * v0.9.1.120.g83c6f815c :
+ Fix package versioning scheme after upstream changes
+
2021-04-16 Pierre Choffet <peuc@wanadoo.fr>
- *r5113.85a6b9941-1 :
+ * r5113.85a6b9941-1 :
Fix build error
2020-12-02 Pierre Choffet <peuc@wanadoo.fr>
diff --git a/PKGBUILD b/PKGBUILD
index 1730165bdb71..a4d9b7977487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Pierre Choffet <peuc@wanadoo.fr>
pkgname=return-to-the-roots-git
-pkgver=r5113.85a6b9941
+pkgver=v0.9.1.120.g83c6f815c
pkgrel=1
pkgdesc="Free/libre implementation of The Settlers II game engine"
arch=("x86_64")
@@ -28,25 +28,25 @@ source=("git+https://github.com/Return-To-The-Roots/s25client.git"
"git+https://github.com/Return-To-The-Roots/version.git"
"git+https://github.com/mat007/turtle.git"
"rttr.sh" "return-to-the-roots.install")
-sha256sums=("SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "SKIP"
- "b623d74292ca332b65290f15adb0c41994a80eb4f5d247c713a0d43775f9e8f8"
- "888a1cd55350971ec3660de79c82760be63ed40617e8ef6931c20b07bc73e1a9")
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'b623d74292ca332b65290f15adb0c41994a80eb4f5d247c713a0d43775f9e8f8'
+ '888a1cd55350971ec3660de79c82760be63ed40617e8ef6931c20b07bc73e1a9')
pkgver() {
cd "s25client/"
- echo "r$(git rev-list --count HEAD).$(git describe --always)"
+ git describe --long | sed 's/-/./g'
}
prepare() {