summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Audet2016-09-25 13:30:08 -0400
committerJeremy Audet2016-09-25 13:30:08 -0400
commitb82a810b10e4840a69c6131316388500a02e6b6e (patch)
treeaad7c8929072588afd5cba4ba5dd77e171d1f6e2
parenta9db73c6d316f1cfdac631881608053909493ef0 (diff)
downloadaur-b82a810b10e4840a69c6131316388500a02e6b6e.tar.gz
Depend on java-runtime=8, not jre8-openjdk
The former dependency is more general, and allows for the use of varying java implementations. Thanks to Tilman Blumenbach ("Tblue") for the tip.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eba2b47b3920..0ad2e5efdae7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
# Generated by mksrcinfo v8
-# Fri Sep 23 00:49:25 UTC 2016
+# Sun Sep 25 17:28:22 UTC 2016
pkgbase = mkgmap
pkgdesc = Create maps for Garmin GPS devices from OpenStreetMap (OSM) data.
pkgver = r3695
- pkgrel = 1
+ pkgrel = 2
url = http://www.mkgmap.org.uk
arch = any
license = GPL2
- depends = jre8-openjdk
+ depends = java-runtime=8
conflicts = mkgmap-svn
source = mkgmap
source = http://www.mkgmap.org.uk/download/mkgmap-r3695.zip
diff --git a/PKGBUILD b/PKGBUILD
index 5d032fe46034..a3fe1ed2bcc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Arnaud Durand-Favreau <biginoz at FREE point FR>
#
-# java-runtime is insufficient as a dependency, as it gives the option of
-# installing either jre7-openjdk or jre8-openjdk, and the latter is required.
+# namcap warns that 'java-environment' is a dependency. This is untrue:
+# java-runtime suffices. Also, java-runtime provides 'sh'.
#
pkgname=mkgmap
pkgver=r3695
-pkgrel=1
+pkgrel=2
pkgdesc='Create maps for Garmin GPS devices from OpenStreetMap (OSM) data.'
url='http://www.mkgmap.org.uk'
license=(GPL2)
arch=(any)
-depends=(jre8-openjdk)
+depends=('java-runtime=8')
conflicts=("${pkgname}-svn")
source=("$pkgname" "http://www.mkgmap.org.uk/download/${pkgname}-${pkgver}.zip")
sha256sums=('135dfbca5146cea34ef48ed6908a817efdfbbcccbb8adfbbb6a100f58c2c7bb6'