[arch-commits] Commit in java-common/trunk (PKGBUILD test_archlinux-java)

[Levente Polyak]

    Date: Thursday, December 5, 2019 @ 22:09:42
  Author: anthraxx
Revision: 370436

upgpkg: java-common 3-2: packager rebuild with small style adjustments

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/test_archlinux-java

---------------------+
 PKGBUILD            |   35 +++++++++++++++++------------------
 test_archlinux-java |    2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-05 20:53:29 UTC (rev 370435)
+++ PKGBUILD	2019-12-05 22:09:42 UTC (rev 370436)
@@ -1,41 +1,40 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+
+pkgbase=java-common
 pkgname=('java-runtime-common' 'java-environment-common')
-pkgbase=java-common
 pkgver=3
-pkgrel=1
+pkgrel=2
+pkgdesc='Common files for Java Runtime Environments'
+url='https://www.archlinux.org/packages/extra/any/java-common/'
 arch=('any')
-url='https://www.archlinux.org/packages/extra/any/java-common/'
 license=('GPL')
+makedepends=('bash' 'findutils' 'coreutils')
 checkdepends=('wget')
-_shunitver=2.1.6
+_shunitver=2.1.7
 source=(profile_jre.csh
         profile_jre.sh
         bin_archlinux-java
         test_archlinux-java
-        shunit2-${_shunitver}.tar.gz::https://github.com/kward/shunit2/archive/source.tar.gz)
-
+        https://github.com/kward/shunit2/archive/v${_shunitver}/shunit2-${_shunitver}.tar.gz)
 sha256sums=('9d25638cafc2fabd1ba6f2f26aa01233eccf3d31db003d956b571f0ab655dd23'
             '519e9881a2a9f4fc3d581ea0ef0da594eedbfdfcf734f9fdc0bb595e8ac77e4c'
             '5101f9d3d42cd545843a537826451c1b2e0bf2b16aba4e36ac797d9ace16dc63'
-            '721b225f6eb420f7b173ba2db8c65688f50ffd5dad0960ecce4cfefdb57b26a2'
-            '6beca93d20b72b46083c8271c4cf1da21b45f250a92b401c2565c65e1d75138f')
+            'f4c3fc55568fbbd298c1bf617bdd7f45db600b47c9991b072e409876e8cdd341'
+            '41a103aa984bfdeea3fec426edb0b3dda19153a5ce448d4b4bbe52a85c4d7fee')
 
 check() {
-  cd "${srcdir}"
-  ln -s shunit2-source/${_shunitver} shunit2
+  ln -s shunit2-${_shunitver} shunit2
   ./test_archlinux-java
 }
 
 package_java-runtime-common() {
   pkgdesc='Common files for Java Runtime Environments'
-  conflicts=('java-common')
-  replaces=('java-common')
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh)
+  depends=('bash' 'findutils' 'coreutils')
   install=install_java-runtime-common.sh
 
-  cd "${srcdir}"
-
   install -d -m 755 "${pkgdir}/usr/lib/jvm/"
   ln -s /dev/null "${pkgdir}/usr/lib/jvm/default"
   ln -s /dev/null "${pkgdir}/usr/lib/jvm/default-runtime"
@@ -57,9 +56,7 @@
 package_java-environment-common() {
   pkgdesc='Common files for Java Development Kits'
 
-  cd "${srcdir}"
-
-  install -d -m 755 "${pkgdir}/usr/bin/"
+  install -d "${pkgdir}/usr/bin"
   # Official list of supplementary binaries that Java environment packages MUST provide
   # This list is based on Arch Linux' default Java implementation: "OpenJDK 7 Icedtea"
   for b in \
@@ -70,3 +67,5 @@
     ln -s /usr/lib/jvm/default/bin/${b} "${pkgdir}/usr/bin/${b}"
   done
 }
+
+# vim: ts=2 sw=2 et:

Modified: test_archlinux-java
===================================================================
--- test_archlinux-java	2019-12-05 20:53:29 UTC (rev 370435)
+++ test_archlinux-java	2019-12-05 22:09:42 UTC (rev 370436)
@@ -462,4 +462,4 @@
 }
 
 # load shunit2
-. shunit2/src/shunit2
+. shunit2/shunit2