summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLone_Wolf2021-05-15 18:15:21 +0200
committerLone_Wolf2021-05-15 18:15:21 +0200
commitcec85fbf8dad552b32e6d2f7d940000e30155f8f (patch)
treeb80f8e7f6d21f8dcb45382e3e2ab5ed336fda908
parent64b93d92731857d076794a9b2e376b122be6ae23 (diff)
downloadaur-cec85fbf8dad552b32e6d2f7d940000e30155f8f.tar.gz
use git+https in source(), also small corrections
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
-rw-r--r--freecol-git.sh2
3 files changed, 11 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb78463ed13e..e3943551dfb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
pkgbase = freecol-git
pkgdesc = A turn-based strategy game based on Colonization, git version build against java8
- pkgver = 0.11840.2430d51
- pkgrel = 1
+ pkgver = 0.15730.c7ccc8d5b
+ pkgrel = 2
url = http://www.freecol.org/
arch = any
license = GPL
makedepends = git
- makedepends = apache-ant
+ makedepends = ant
makedepends = junit
makedepends = texlive-core
depends = java-environment=8
depends = bash
- source = freecol-git::git://git.code.sf.net/p/freecol/git#branch=master
+ source = freecol-git::git+https://git.code.sf.net/p/freecol/git
source = freecol-git.sh
sha512sums = SKIP
- sha512sums = 7edefad3c1f4ccc3f0cebe6b52f8a6c981f4910b937d5dfe731e0a7348982e26a65d38b0257996131120953f860a9f679cafb9bce5a2fbfe3c57d93ae5bba4e5
+ sha512sums = bb7a55738b5d15dfdb49cbe6355241fedcbe73ad24ec4c0773fcd08f2d82b14b1390e134b0ab0fbe98e1f832410bb5ffba1d88fbd64b3917b9abc5fe24596c57
pkgname = freecol-git
diff --git a/PKGBUILD b/PKGBUILD
index 1ffad5e8cc61..b5269ff8d675 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,19 @@
# Contributor: TDY <tdy@gmx.com>
# Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com>
-pkgbase=freecol-git
pkgname=freecol-git
-pkgver=0.11840.2430d51
-pkgrel=1
+pkgver=0.15730.c7ccc8d5b
+pkgrel=2
pkgdesc="A turn-based strategy game based on Colonization, git version build against java8 "
arch=('any')
url="http://www.freecol.org/"
license=('GPL')
depends=('java-environment=8' 'bash')
-makedepends=('git' 'apache-ant' 'junit' 'texlive-core')
-source=("$pkgname::git://git.code.sf.net/p/freecol/git#branch=master"
+makedepends=('git' 'ant' 'junit' 'texlive-core')
+source=("$pkgname::git+https://git.code.sf.net/p/freecol/git"
'freecol-git.sh')
sha512sums=('SKIP'
- '7edefad3c1f4ccc3f0cebe6b52f8a6c981f4910b937d5dfe731e0a7348982e26a65d38b0257996131120953f860a9f679cafb9bce5a2fbfe3c57d93ae5bba4e5')
+ 'bb7a55738b5d15dfdb49cbe6355241fedcbe73ad24ec4c0773fcd08f2d82b14b1390e134b0ab0fbe98e1f832410bb5ffba1d88fbd64b3917b9abc5fe24596c57')
pkgver() {
cd "${srcdir}/${pkgname}"
diff --git a/freecol-git.sh b/freecol-git.sh
index ab94e0df50ee..d72a0f44015f 100644
--- a/freecol-git.sh
+++ b/freecol-git.sh
@@ -1,4 +1,4 @@
#!/bin/bash
_FC_PATH=/usr/share/java/freecol-git
-exec "$JAVA_HOME/bin/java" -Xms4096M -Xmx4096M -jar $_FC_PATH/FreeCol.jar --freecol-data $_FC_PATH/data "$@"
+exec /usr/bin/java -Xms4096M -Xmx4096M -jar $_FC_PATH/FreeCol.jar --freecol-data $_FC_PATH/data "$@"