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

2020-05-16 Thread Felix Yan via arch-commits 
Date: Saturday, May 16, 2020 @ 09:30:54
  Author: felixonmars
Revision: 383876

upgpkg: java-common 3-3: reproducibility rebuild

Modified:
  java-common/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 09:30:23 UTC (rev 383875)
+++ PKGBUILD2020-05-16 09:30:54 UTC (rev 383876)
@@ -4,7 +4,7 @@
 pkgbase=java-common
 pkgname=('java-runtime-common' 'java-environment-common')
 pkgver=3
-pkgrel=2
+pkgrel=3
 pkgdesc='Common files for Java Runtime Environments'
 url='https://www.archlinux.org/packages/extra/any/java-common/'
 arch=('any')

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

2019-12-05 Thread Levente Polyak via arch-commits 
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
===
--- PKGBUILD2019-12-05 20:53:29 UTC (rev 370435)
+++ PKGBUILD2019-12-05 22:09:42 UTC (rev 370436)
@@ -1,41 +1,40 @@
-# Maintainer: Guillaume ALAUX 
+# Maintainer: Levente Polyak 
+# Contributor: Guillaume ALAUX 
+
+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

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

2017-10-15 Thread Guillaume Alaux 
Date: Sunday, October 15, 2017 @ 08:31:11
  Author: guillaume
Revision: 307937

Update URL

Modified:
  java-common/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-15 06:32:29 UTC (rev 307936)
+++ PKGBUILD2017-10-15 08:31:11 UTC (rev 307937)
@@ -4,7 +4,7 @@
 pkgver=3
 pkgrel=1
 arch=('any')
-url='www.archlinux.org'
+url='https://www.archlinux.org/packages/extra/any/java-common/'
 license=('GPL')
 checkdepends=('wget')
 _shunitver=2.1.6

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

2015-07-19 Thread Guillaume Alaux 
Date: Sunday, July 19, 2015 @ 21:36:48
  Author: guillaume
Revision: 242376

Fix FS#45598 update shunit2 download location

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

-+
 PKGBUILD|8 +---
 test_archlinux-java |4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-19 19:01:35 UTC (rev 242375)
+++ PKGBUILD2015-07-19 19:36:48 UTC (rev 242376)
@@ -7,20 +7,22 @@
 url='www.archlinux.org'
 license=('GPL')
 checkdepends=('wget')
+_shunitver=2.1.6
 source=(profile_jre.csh
 profile_jre.sh
 bin_archlinux-java
 test_archlinux-java
-https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz)
+
shunit2-${_shunitver}.tar.gz::https://github.com/kward/shunit2/archive/source.tar.gz)
 
 sha256sums=('9d25638cafc2fabd1ba6f2f26aa01233eccf3d31db003d956b571f0ab655dd23'
 '519e9881a2a9f4fc3d581ea0ef0da594eedbfdfcf734f9fdc0bb595e8ac77e4c'
 '272296ec7ca673b4f9f59fb70565328b6daef682c29cd964c988c018090c3fc2'
-'c2c413a6b2f8b88ed170a5b19f7cb620518e09686f0d286b4b27d30f571e5050'
-'65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
+'565aad3e35b7435d5050cba2363c39affa739c9af8b9626aff0678850fa64025'
+'6beca93d20b72b46083c8271c4cf1da21b45f250a92b401c2565c65e1d75138f')
 
 check() {
   cd ${srcdir}
+  ln -s shunit2-source/${_shunitver} shunit2
   ./test_archlinux-java
 }
 

Modified: test_archlinux-java
===
--- test_archlinux-java 2015-07-19 19:01:35 UTC (rev 242375)
+++ test_archlinux-java 2015-07-19 19:36:48 UTC (rev 242376)
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/)
+# To run this script, ensure shunit2 (https://github.com/kward/shunit2)
 # is available on the local directory, then just run sh 
bin_archlinux-java_tests
 #
 # inotifywait -r -m -e MODIFY . | while read l; do sh 
bin_archlinux-java_tests; done
@@ -283,4 +283,4 @@
 }
 
 # load shunit2
-. shunit2-2.1.6/src/shunit2
+. shunit2/src/shunit2

[arch-commits] Commit in java-common/trunk (PKGBUILD install_java-common.sh)

2014-09-08 Thread Guillaume Alaux 
Date: Monday, September 8, 2014 @ 21:35:16
  Author: guillaume
Revision: 221179

Do not try to set/fix links

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/install_java-common.sh

+
 PKGBUILD   |2 +-
 install_java-common.sh |   39 ---
 2 files changed, 1 insertion(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-08 19:30:34 UTC (rev 221178)
+++ PKGBUILD2014-09-08 19:35:16 UTC (rev 221179)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=java-common
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'

Modified: install_java-common.sh
===
--- install_java-common.sh  2014-09-08 19:30:34 UTC (rev 221178)
+++ install_java-common.sh  2014-09-08 19:35:16 UTC (rev 221179)
@@ -1,43 +1,4 @@
-JVM_DIR=/usr/lib/jvm
-OLD_DEFAULT_NAME=java-default-runtime
-OLD_DEFAULT_PATH=${JVM_DIR}/${OLD_DEFAULT_NAME}
-DEFAULT_NAME=default
-DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
-DEFAULT_NAME_JRE=default-runtime
-DEFAULT_PATH_JRE=${JVM_DIR}/${DEFAULT_NAME_JRE}
-
-# $1: Java environment name to set as default
-set_default_link_to() {
-  new_default=$1
-  unlink ${DEFAULT_PATH} 2/dev/null
-  ln -sf ${new_default} ${DEFAULT_PATH}
-
-  unlink ${DEFAULT_PATH_JRE} 2/dev/null
-  if [[ ${new_default} == */jre ]]; then
-ln -sf ${new_default} ${DEFAULT_PATH_JRE}
-  else
-ln -sf ${new_default}/jre ${DEFAULT_PATH_JRE}
-  fi
-}
-
-pre_install() {
-  _curr_def=$(readlink ${OLD_DEFAULT_PATH}  true)
-  if [ -n ${_curr_def} ]; then
-unlink ${OLD_DEFAULT_PATH}  /dev/null 21
-ln -sf ${DEFAULT_NAME} ${OLD_DEFAULT_PATH}
-
-set_default_link_to ${_curr_def}
-  fi
-}
-
-pre_upgrade() {
-  pre_install $@
-}
-
 post_install() {
-  echo 'Installing multiple non-conflicting Java environments is now supported'
-  echo 'Check the following wiki section for more info:'
-  echo '  https://wiki.archlinux.org/index.php/Java'
   echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/default'
   echo 'If not, you may have to logout and login again to set it according to 
/etc/profile.d/jre.sh'
 }

[arch-commits] Commit in java-common/trunk (PKGBUILD install_java-common.sh)

2014-09-04 Thread Guillaume Alaux 
Date: Thursday, September 4, 2014 @ 15:50:20
  Author: guillaume
Revision: 220939

Fix FS#41814 add missing double quotes on current JDK check

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/install_java-common.sh

+
 PKGBUILD   |2 +-
 install_java-common.sh |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-04 11:56:08 UTC (rev 220938)
+++ PKGBUILD2014-09-04 13:50:20 UTC (rev 220939)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=java-common
 pkgver=1
-pkgrel=6
+pkgrel=7
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'

Modified: install_java-common.sh
===
--- install_java-common.sh  2014-09-04 11:56:08 UTC (rev 220938)
+++ install_java-common.sh  2014-09-04 13:50:20 UTC (rev 220939)
@@ -22,7 +22,7 @@
 
 pre_install() {
   _curr_def=$(readlink ${OLD_DEFAULT_PATH}  true)
-  if [ -n ${_curr_def} ]; then
+  if [ -n ${_curr_def} ]; then
 unlink ${OLD_DEFAULT_PATH}  /dev/null 21
 ln -sf ${DEFAULT_NAME} ${OLD_DEFAULT_PATH}

[arch-commits] Commit in java-common/trunk (PKGBUILD profile_jre.csh)

2014-08-20 Thread Guillaume Alaux 
Date: Wednesday, August 20, 2014 @ 10:15:35
  Author: guillaume
Revision: 220263

Fix profile jre.csh using wrong syntax

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/profile_jre.csh

-+
 PKGBUILD|4 ++--
 profile_jre.csh |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-20 02:49:53 UTC (rev 220262)
+++ PKGBUILD2014-08-20 08:15:35 UTC (rev 220263)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=java-common
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'
@@ -19,7 +19,7 @@
 bin_java-common-wrapper
 https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz)
 
-sha256sums=('06465b5c0507cb6c500c4f9cbd93e2fadaafe37b9e814b9687e1ee94fec0de73'
+sha256sums=('073ebe73e05346c03c29d02c73cca38f6a4fccc9f3ab2026760f1cd29791fabb'
 '458eced6d2846805fbc18ca2ba717bf5f0556cc93a442b485c81fe12a4f6e5b6'
 'a44e4842b7c659f4f6628745090d2dde3874e225317043493d5996353c7b8b74'
 '0dd93c9779c617af061b25f5e3d23cacb741d8d757f533312c3af976661e8cbc'

Modified: profile_jre.csh
===
--- profile_jre.csh 2014-08-20 02:49:53 UTC (rev 220262)
+++ profile_jre.csh 2014-08-20 08:15:35 UTC (rev 220263)
@@ -3,4 +3,4 @@
 setenv JAVA_HOME /usr/lib/jvm/java-default-runtime
 
 # Enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
+#setenv _JAVA_AWT_WM_NONREPARENTING 1

[arch-commits] Commit in java-common/trunk (PKGBUILD install_java-common.sh)

2014-08-19 Thread Guillaume Alaux 
Date: Tuesday, August 19, 2014 @ 12:34:34
  Author: guillaume
Revision: 220242

Fix wiki link in install script

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/install_java-common.sh

+
 PKGBUILD   |2 +-
 install_java-common.sh |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-19 08:59:43 UTC (rev 220241)
+++ PKGBUILD2014-08-19 10:34:34 UTC (rev 220242)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=java-common
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'

Modified: install_java-common.sh
===
--- install_java-common.sh  2014-08-19 08:59:43 UTC (rev 220241)
+++ install_java-common.sh  2014-08-19 10:34:34 UTC (rev 220242)
@@ -1,7 +1,7 @@
 post_install() {
   echo 'Installing multiple non-conflicting Java environments is now supported'
   echo 'Check the following wiki section for more info:'
-  echo '  
https://wiki.archlinux.org/index.php/Java#Multiple_official_Java_environments'
+  echo '  https://wiki.archlinux.org/index.php/Java'
   echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/java-default-runtime'
   echo 'If not, you may have to logout and login again to set it according to 
/etc/profile.d/jre.sh'
 }

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

2014-08-17 Thread Guillaume Alaux 
Date: Sunday, August 17, 2014 @ 11:23:37
  Author: guillaume
Revision: 220146

Fix typo on archlinux-java usage

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

+
 PKGBUILD   |2 +-
 bin_archlinux-java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-17 09:00:57 UTC (rev 220145)
+++ PKGBUILD2014-08-17 09:23:37 UTC (rev 220146)
@@ -21,7 +21,7 @@
 
 sha256sums=('06465b5c0507cb6c500c4f9cbd93e2fadaafe37b9e814b9687e1ee94fec0de73'
 '458eced6d2846805fbc18ca2ba717bf5f0556cc93a442b485c81fe12a4f6e5b6'
-'5f3d1ac5de7018344fc813a1a0a8b4afe15888bfdc3b8190378b463f408c2eda'
+'a44e4842b7c659f4f6628745090d2dde3874e225317043493d5996353c7b8b74'
 '0dd93c9779c617af061b25f5e3d23cacb741d8d757f533312c3af976661e8cbc'
 '622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39'
 '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')

Modified: bin_archlinux-java
===
--- bin_archlinux-java  2014-08-17 09:00:57 UTC (rev 220145)
+++ bin_archlinux-java  2014-08-17 09:23:37 UTC (rev 220146)
@@ -166,7 +166,7 @@
   echo $(basename $0) COMMAND
   echo -e \nCOMMAND:
   echo -e '\tstatus\t\tList installed Java environments and enabled one'
-  echo -e '\tget\t\tReturns the short name of the Java environment set as 
default'
+  echo -e '\tget\t\tReturn the short name of the Java environment set as 
default'
   echo -e '\tset JAVA_ENV\tForce JAVA_ENV as default'
   echo -e '\tunset\t\tUnset current default Java environment'
   echo -e '\tfix\t\tFix an invalid/broken default Java environment 
configuration'

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

2014-08-07 Thread Guillaume Alaux 
Date: Thursday, August 7, 2014 @ 21:20:55
  Author: guillaume
Revision: 219477

pkgrel bump before push

Modified:
  java-common/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-07 19:11:09 UTC (rev 219476)
+++ PKGBUILD2014-08-07 19:20:55 UTC (rev 219477)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgname=java-common
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'