Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-01-27 21:29:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-01-25 15:00:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-01-27 21:29:23.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 27 07:36:56 UTC 2012 - [email protected] + +- fix alljava.sh bug introduced with last commit (bnc#722252) + +------------------------------------------------------------------- New: ---- aaa_base-fix-alljava-bnc722252.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.HCztBo/_old 2012-01-27 21:29:46.000000000 +0100 +++ /var/tmp/diff_new_pack.HCztBo/_new 2012-01-27 21:29:46.000000000 +0100 @@ -20,9 +20,7 @@ Name: aaa_base Version: 12.1 -Release: 105 -License: GPL-2.0+ -Group: System/Fhs +Release: 0 Url: http://gitorious.org/opensuse/aaa_base Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} @@ -31,9 +29,12 @@ Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Summary: SUSE Linux Base Package +License: GPL-2.0+ +Group: System/Fhs BuildRoot: %{_tmppath}/%{name}-%{version}-build # run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 +Patch1: aaa_base-fix-alljava-bnc722252.diff Source99: aaa_base-rpmlintrc %description @@ -41,7 +42,6 @@ scripts like SuSEconfig are also in this package. %package extras -License: GPL-2.0+ Summary: SUSE Linux Base Package (recommended part) Group: System/Fhs Requires: %{name} = %{version} @@ -54,6 +54,7 @@ %prep %setup -n aaa_base +%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} ++++++ aaa_base-fix-alljava-bnc722252.diff ++++++ Index: b/files/etc/profile.d/alljava.sh =================================================================== --- a/files/etc/profile.d/alljava.sh +++ b/files/etc/profile.d/alljava.sh @@ -9,37 +9,38 @@ # JDK_HOME, SDK_HOME # for JDIR in /usr/lib64/jvm /usr/lib/jvm /usr/java/latest /usr/java; do - if ! test -d $JPATH; then + if ! test -d $JDIR; then continue fi for JPATH in $JDIR $JDIR/java `ls -I 'java' -I 'jre' -d $JDIR/* 2>/dev/null` $JDIR/jre; do - if ! test -x $JPATH/bin/java ; then + if ! test -x $JPATH/bin/java; then continue fi - export JAVA_BINDIR=3D$JPATH/bin - export JAVA_ROOT=3D$JPATH - export JAVA_HOME=3D$JPATH + export JAVA_BINDIR=$JPATH/bin + export JAVA_ROOT=$JPATH + export JAVA_HOME=$JPATH unset JDK_HOME unset SDK_HOME case "$JPATH" in *jre*) - export JRE_HOME=3D$JPATH + export JRE_HOME=$JPATH ;; *) - export JRE_HOME=3D$JPATH/jre + export JRE_HOME=$JPATH/jre # it is development kit if [ -x $JPATH/bin/javac ] ; then - export JDK_HOME=3D$JPATH - export SDK_HOME=3D$JPATH + export JDK_HOME=$JPATH + export SDK_HOME=$JPATH + break; # we found a JRE + SDK -- don't look any further fi ;; esac done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
