summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD12
2 files changed, 7 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f8113a78aff..e5cf6e0ab5bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gradle6
pkgdesc = Powerful build system for the JVM
pkgver = 6.9.2
- pkgrel = 2
+ pkgrel = 3
url = https://gradle.org/
arch = any
license = Apache
@@ -13,9 +13,6 @@ pkgbase = gradle6
makedepends = java-environment=11
depends = java-environment
depends = bash
- conflicts = gradle
- conflicts = gradle-doc
- conflicts = gradle-src
source = https://services.gradle.org/distributions/gradle-6.9.2-src.zip
source = gradle6
sha256sums = e1cf93f227498a243cc9502bcf9c0c5bc5a52276db0733acb4101b653bb66687
diff --git a/PKGBUILD b/PKGBUILD
index 3f08b645a4ed..b2251ecff606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
# Maintainer: AmberArch <amber@mail.cyborgtrees.com>
+# Contributor: Gerard Ribugent Navarro <ribugent@gmail.com>
# Contributor: Arnaud Dovi <mr.dovi@gmail.com>
# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Simon Legner <Simon.Legner@gmail.com>
@@ -7,9 +8,8 @@
pkgbase=gradle6
pkgname=('gradle6' 'gradle6-doc' 'gradle6-src')
-conflicts=('gradle' 'gradle-doc' 'gradle-src')
pkgver=6.9.2
-pkgrel=2
+pkgrel=3
pkgdesc='Powerful build system for the JVM'
url='https://gradle.org/'
arch=('any')
@@ -69,8 +69,8 @@ package_gradle6-doc() {
options=('!strip')
cd ${pkgbase/6/}-${pkgver}/dist
- install -d "${pkgdir}/usr/share/java/${pkgbase/6/}/docs"
- cp -r docs/* "${pkgdir}/usr/share/java/${pkgbase/6/}/docs"
+ install -d "${pkgdir}/usr/share/java/${pkgbase}/docs"
+ cp -r docs/* "${pkgdir}/usr/share/java/${pkgbase}/docs"
}
package_gradle6-src() {
@@ -78,8 +78,8 @@ package_gradle6-src() {
options=('!strip')
cd ${pkgbase/6/}-${pkgver}/dist
- install -d "${pkgdir}/usr/share/java/${pkgbase/6/}/src"
- cp -r src/* "${pkgdir}/usr/share/java/${pkgbase/6/}/src"
+ install -d "${pkgdir}/usr/share/java/${pkgbase}/src"
+ cp -r src/* "${pkgdir}/usr/share/java/${pkgbase}/src"
}
# vim: ts=2 sw=2 et: