summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Northon2023-10-15 17:20:02 -0400
committerPatrick Northon2023-10-15 17:20:02 -0400
commitba67201ac999c2592ed790052d10dc855cacc158 (patch)
tree5c70f16d23ad6ed28cbe5f11af86f6a1871008ad
parentb0fb31e1e8407fd1cab3ca3f0a01896db67aaaad (diff)
downloadaur-ba67201ac999c2592ed790052d10dc855cacc158.tar.gz
Pin java version to 17 and remove unnecessary common license file.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c9663a917b8..e72379a8c93d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = maptool
pkgdesc = An open source virtual tabletop program
pkgver = 1.13.2
- pkgrel = 2
+ pkgrel = 3
url = https://rptools.net/tools/maptool
install = maptool.install
arch = x86_64
@@ -12,8 +12,8 @@ pkgbase = maptool
makedepends = gradle7
makedepends = xdg-utils
makedepends = rpm-tools
- depends = java-runtime>=17
- depends = java-openjfx>=17
+ depends = java-runtime=17
+ depends = java-openjfx=17
source = git+https://github.com/RPTools/maptool.git#tag=1.13.2
source = maptool.sh
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4fae200c2ac5..cb35ff9fa1af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
pkgname=maptool
_pkgname=MapTool
pkgver=1.13.2
-pkgrel=2
+pkgrel=3
pkgdesc="An open source virtual tabletop program"
arch=('x86_64')
url='https://rptools.net/tools/maptool'
license=('AGPL3')
-depends=('java-runtime>=17' 'java-openjfx>=17')
+depends=('java-runtime=17' 'java-openjfx=17')
makedepends=('git' 'dpkg' 'jdk17-openjdk' 'gradle7' 'xdg-utils' 'rpm-tools')
optdepends=()
source=(
@@ -45,8 +45,7 @@ package() {
cd "${pkgdir}"
dpkg-deb -x "${srcdir}/${pkgname}/releases/"*.deb .
- #mkdir -p "usr/share/licenses/${pkgname}"
- #mv "${pkgdir}/${_prefix}/share/doc/copyright" "usr/share/licenses/${pkgname}/"
+
install -dm755 "usr/share/java/${pkgname}"
rm "${_prefix}/lib/app"/javafx*.jar
mv "${_prefix}/lib/app"/*.jar "usr/share/java/${pkgname}"
@@ -55,9 +54,6 @@ package() {
install -dm755 'usr/share/pixmaps'
mv "${_prefix}/lib/"*.png "usr/share/pixmaps/${pkgname}.png"
- #rpmextract.sh "${srcdir}/${pkgname}/releases/"*.rpm
- #mv "usr/share/licenses/maptool-${pkgver}" "usr/share/licenses/${pkgname}"
-
install -dm755 'usr/share/applications'
mv "${pkgdir}/${_prefix}/lib/"*.desktop "usr/share/applications/${pkgname}.desktop"
sed -i 's|Exec=/opt/maptool/bin/MapTool|Exec=/usr/bin/maptool|' "usr/share/applications/${pkgname}.desktop"