From f144ac3b42cdac138d8cba37f6939e81b24beef5 Mon Sep 17 00:00:00 2001
From: Thyrum <adj00@protonmail.com>
Date: Mon, 20 Dec 2021 22:41:13 +0100
Subject: [PATCH] Revert "Remove now unuseful _pkgver"

This reverts commit 93033aea881ce97f7210bb04134419c78bfb012c.

The `_pkgver` was required to distinguish between the GitHub and AUR
version numbers because the GitHub version can contain a `-` if it is a
patch release and AUR versions may never contain a `-`.
---
 .SRCINFO |  2 +-
 PKGBUILD | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f1c125f6a31a8..828ef3706d06b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = unciv-bin
 	pkgdesc = Open-source remake of Civilization V
 	pkgver = 3.18.11
-	pkgrel = 3
+	pkgrel = 1
 	url = https://github.com/yairm210/Unciv
 	arch = any
 	license = MPL-2.0
diff --git a/PKGBUILD b/PKGBUILD
index 4d2efac623c74..ff81b1ee32099 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 
 pkgname=unciv-bin
 _pkgname=Unciv
-pkgver=3.18.11
-pkgrel=3
+_pkgver=3.18.11
+pkgver=${_pkgver//-/_}
+pkgrel=2
 pkgdesc="Open-source remake of Civilization V"
 url="https://github.com/yairm210/Unciv"
 license=('MPL-2.0')
@@ -12,13 +13,13 @@ provides=('unciv')
 conflicts=('unciv')
 arch=('any')
 source=(
-  "$_pkgname-$pkgver.jar::https://github.com/yairm210/Unciv/releases/download/$pkgver/Unciv.jar"
-  "$_pkgname-$pkgver.png::https://raw.githubusercontent.com/yairm210/$_pkgname/$pkgver/extraImages/Unciv%20icon%20v4.png"
+  "$_pkgname-$_pkgver.jar::https://github.com/yairm210/Unciv/releases/download/$_pkgver/Unciv.jar"
+  "$_pkgname-$_pkgver.png::https://raw.githubusercontent.com/yairm210/$_pkgname/$_pkgver/extraImages/Unciv%20icon%20v4.png"
   "$_pkgname.sh"
   "$_pkgname.desktop"
 )
 noextract=(
-	"$_pkgname-$pkgver.jar"
+	"$_pkgname-$_pkgver.jar"
 )
 md5sums=('fff6fce23b721722ffe3cc833848eca4'
          '5aca7fc33f121fcf901fef14f784731a'
@@ -28,6 +29,6 @@ md5sums=('fff6fce23b721722ffe3cc833848eca4'
 package() {
   install -Dm755 $_pkgname.sh "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 $_pkgname-$pkgver.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  install -Dm644 $_pkgname-$pkgver.jar "$pkgdir/usr/share/$_pkgname/$_pkgname.jar"
+  install -Dm644 $_pkgname-$_pkgver.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 $_pkgname-$_pkgver.jar "$pkgdir/usr/share/$_pkgname/$_pkgname.jar"
 }