Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2026-06-01 17:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.1937 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Mon Jun 1 17:59:18 2026 rev:517 rq:1355891 version:84.87+git20260529.c4391e5 Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2026-02-11 18:48:27.228385343 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.1937/aaa_base.changes 2026-06-01 17:59:22.314791889 +0200 @@ -1,0 +2,9 @@ +Fri May 29 12:58:41 UTC 2026 - Ruediger Oertel <[email protected]> + +- Update to version 84.87+git20260529.c4391e5: + * $status -> $? + * Simplifying the sh part too + * Addressing review comments and simplifying a bit + * Handle javas managed by libalternatives and by update-alternatives alike + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20260210.ecce285.tar New: ---- aaa_base-84.87+git20260529.c4391e5.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.761j6z/_old 2026-06-01 17:59:23.790853105 +0200 +++ /var/tmp/diff_new_pack.761j6z/_new 2026-06-01 17:59:23.790853105 +0200 @@ -1,7 +1,7 @@ # # spec file for package aaa_base # -# Copyright (c) 2026 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ %endif Name: aaa_base -Version: 84.87+git20260210.ecce285%{git_version} +Version: 84.87+git20260529.c4391e5%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.761j6z/_old 2026-06-01 17:59:23.878856755 +0200 +++ /var/tmp/diff_new_pack.761j6z/_new 2026-06-01 17:59:23.882856921 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">ecce285cefe9674b3649b17ec6a4c1487ae974f5</param></service> + <param name="changesrevision">c4391e5bc4a6c73a40e8a6d11f3a43af9145d995</param></service> </servicedata> (No newline at EOF) ++++++ aaa_base-84.87+git20260210.ecce285.tar -> aaa_base-84.87+git20260529.c4391e5.tar ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20260210.ecce285/files/usr/etc/profile.d/alljava.csh new/aaa_base-84.87+git20260529.c4391e5/files/usr/etc/profile.d/alljava.csh --- old/aaa_base-84.87+git20260210.ecce285/files/usr/etc/profile.d/alljava.csh 2026-02-10 10:26:11.000000000 +0100 +++ new/aaa_base-84.87+git20260529.c4391e5/files/usr/etc/profile.d/alljava.csh 2026-05-29 14:58:09.000000000 +0200 @@ -9,18 +9,40 @@ # JDK_HOME, SDK_HOME # -if ( -l /etc/alternatives/java && -e /etc/alternatives/java ) then - set ALTERNATIVES_JAVA_LINK=`realpath /etc/alternatives/java` - setenv JRE_HOME $ALTERNATIVES_JAVA_LINK:h:h - unset ALTERNATIVES_JAVA_LINK +which alts >& /dev/null +if ( $? == 0 ) then + alts -t java >& /dev/null + if ( $? == 0 ) then + set JAVA_TARGET `alts -t java` + endif + + alts -t javac >& /dev/null + if ( $? == 0 ) then + set JAVAC_TARGET `alts -t javac` + endif +endif + +if ( ! $?JAVA_TARGET ) then + if ( -l /etc/alternatives/java && -e /etc/alternatives/java ) then + set JAVA_TARGET=`realpath /etc/alternatives/java` + endif +endif + +if ( ! $?JAVAC_TARGET ) then + if ( -l /etc/alternatives/javac && -e /etc/alternatives/javac ) then + set JAVAC_TARGET=`realpath /etc/alternatives/javac` + endif +endif + +if ( $?JAVA_TARGET ) then + setenv JRE_HOME $JAVA_TARGET:h:h + unset JAVA_TARGET endif -if ( -l /etc/alternatives/javac && -e /etc/alternatives/javac ) then - set ALTERNATIVES_JAVAC_LINK=`realpath /etc/alternatives/javac` - setenv JAVA_HOME $ALTERNATIVES_JAVAC_LINK:h:h - setenv JAVA_BINDIR $JAVA_HOME/bin +if ( $?JAVAC_TARGET ) then + setenv JAVA_HOME $JAVAC_TARGET:h:h + setenv JAVA_BINDIR $JAVAC_TARGET:h setenv JDK_HOME $JAVA_HOME setenv SDK_HOME $JAVA_HOME - unset ALTERNATIVES_JAVAC_LINK + unset JAVAC_TARGET endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20260210.ecce285/files/usr/etc/profile.d/alljava.sh new/aaa_base-84.87+git20260529.c4391e5/files/usr/etc/profile.d/alljava.sh --- old/aaa_base-84.87+git20260210.ecce285/files/usr/etc/profile.d/alljava.sh 2026-02-10 10:26:11.000000000 +0100 +++ new/aaa_base-84.87+git20260529.c4391e5/files/usr/etc/profile.d/alljava.sh 2026-05-29 14:58:09.000000000 +0200 @@ -9,18 +9,37 @@ # JDK_HOME, SDK_HOME # -if test -L /etc/alternatives/java -a -e /etc/alternatives/java; then - ALTERNATIVES_JAVA_LINK=`realpath /etc/alternatives/java 2> /dev/null` - export JRE_HOME=${ALTERNATIVES_JAVA_LINK%/bin/java} - unset ALTERNATIVES_JAVA_LINK +if command -v alts >/dev/null 2>&1; then + if alts -t java >/dev/null 2>&1; then + JAVA_TARGET=$(alts -t java) + fi + + if alts -t javac >/dev/null 2>&1; then + JAVAC_TARGET=$(alts -t javac) + fi +fi + +if [ -z "$JAVA_TARGET" ]; then + if test -L /etc/alternatives/java -a -e /etc/alternatives/java; then + JAVA_TARGET=$(realpath /etc/alternatives/java 2>/dev/null) + fi fi -if test -L /etc/alternatives/javac -a -e /etc/alternatives/javac; then - ALTERNATIVES_JAVAC_LINK=`realpath /etc/alternatives/javac 2> /dev/null` - export JAVA_HOME=${ALTERNATIVES_JAVAC_LINK%/bin/javac} - export JAVA_BINDIR=$JAVA_HOME/bin - export JDK_HOME=$JAVA_HOME - export SDK_HOME=$JAVA_HOME - unset ALTERNATIVES_JAVAC_LINK +if [ -z "$JAVAC_TARGET" ]; then + if test -L /etc/alternatives/javac -a -e /etc/alternatives/javac; then + JAVAC_TARGET=$(realpath /etc/alternatives/javac 2>/dev/null) + fi fi +if [ ! -z "$JAVA_TARGET" ]; then + export JRE_HOME="${JRE_HOME%/bin/java}" + unset JAVA_TARGET +fi + +if [ ! -z "$JAVAC_TARGET" ]; then + export JAVA_HOME=${JAVAC_TARGET%/bin/javac} + export JAVA_BINDIR=${JAVAC_TARGET%/javac} + export JDK_HOME="$JAVA_HOME" + export SDK_HOME="$JAVA_HOME" + unset JAVAC_TARGET +fi
