summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Choffet2018-08-31 17:57:21 -0400
committerPierre Choffet2018-08-31 17:57:21 -0400
commite40d22fcb74261194f773cfc30e290f29aa4d6d5 (patch)
tree1c3f8e0342336231642880d41c0f56a7a5c62db3
parent6ef473483d76fd804f3848e80a5055c1ac73ebf1 (diff)
downloadaur-e40d22fcb74261194f773cfc30e290f29aa4d6d5.tar.gz
Add optional dependency
-rw-r--r--.SRCINFO7
-rw-r--r--ChangeLog4
-rw-r--r--PKGBUILD5
-rw-r--r--return-to-the-roots.install1
4 files changed, 12 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f470b7a98ff..b69280f839cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Aug 22 18:30:01 UTC 2018
+# Fri Aug 31 21:53:29 UTC 2018
pkgbase = return-to-the-roots-git
pkgdesc = Free/libre implementation of The Settlers II game engine
- pkgver = r3946.826300c2
+ pkgver = r3949.2d1e2c02
pkgrel = 1
url = https://siedler25.org/
install = return-to-the-roots.install
@@ -22,6 +22,7 @@ pkgbase = return-to-the-roots-git
depends = sdl_mixer
depends = miniupnpc
depends = lua52
+ optdepends = siedler2-data
provides = return-to-the-roots
conflicts = return-to-the-roots
conflicts = s25rttr
@@ -53,7 +54,7 @@ pkgbase = return-to-the-roots-git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = b623d74292ca332b65290f15adb0c41994a80eb4f5d247c713a0d43775f9e8f8
- sha256sums = edb41253442928a2313f856021c06f6d2999b780f0426c05cd7bdb2381a627ea
+ sha256sums = 888a1cd55350971ec3660de79c82760be63ed40617e8ef6931c20b07bc73e1a9
pkgname = return-to-the-roots-git
diff --git a/ChangeLog b/ChangeLog
index c6cdd8518d18..6828ee98aef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-31 Pierre Choffet <peuc@wanadoo.fr>
+ * r3949.2d1e2c02-1 :
+ Add siedler2-data package as optional dependency
+
2018-08-22 Pierre Choffet <peuc@wanadoo.fr>
* r3946.826300c2-1 :
Add missing dependencies
diff --git a/PKGBUILD b/PKGBUILD
index e9262ab3032f..67af5e553fe4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Pierre Choffet <peuc@wanadoo.fr>
pkgname=return-to-the-roots-git
-pkgver=r3946.826300c2
+pkgver=r3949.2d1e2c02
pkgrel=1
pkgdesc="Free/libre implementation of The Settlers II game engine"
arch=("x86_64")
@@ -9,6 +9,7 @@ url="https://siedler25.org/"
license=("GPL3")
makedepends=("cmake" "git" "boost" "mesa" "sdl_mixer" "curl" "lua52" "miniupnpc")
depends=("boost-libs" "libgl" "sdl_mixer" "miniupnpc" "lua52")
+optdepends=("siedler2-data")
conflicts=("return-to-the-roots" "s25rttr" "s25rttr-nightly-bin")
provides=("return-to-the-roots")
install="return-to-the-roots.install"
@@ -39,7 +40,7 @@ sha256sums=("SKIP"
"SKIP"
"SKIP"
"b623d74292ca332b65290f15adb0c41994a80eb4f5d247c713a0d43775f9e8f8"
- "edb41253442928a2313f856021c06f6d2999b780f0426c05cd7bdb2381a627ea")
+ "888a1cd55350971ec3660de79c82760be63ed40617e8ef6931c20b07bc73e1a9")
pkgver() {
cd "s25client/"
diff --git a/return-to-the-roots.install b/return-to-the-roots.install
index 5d19bbf8b069..a795613720d5 100644
--- a/return-to-the-roots.install
+++ b/return-to-the-roots.install
@@ -1,3 +1,4 @@
post_install() {
echo " Put your original Settlers 2 DATA and GFX folders in /usr/share/s25rttr/S2/"
+ echo " (or install siedler2-data package from the AUR)"
}