Accepting request 101806 from home:seife:branches:Base:System

fix alljava.sh bug introduced with last commit (bnc#722252)

OBS-URL: https://build.opensuse.org/request/show/101806
OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=340

aaa_base-fix-alljava-bnc722252.diff

@@ -0,0 +1,52 @@
+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

aaa_base.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 27 07:36:56 UTC 2012 - seife+obs@b1-systems.com
+
+- fix alljava.sh bug introduced with last commit (bnc#722252)
+
 -------------------------------------------------------------------
 Fri Jan 20 10:19:45 UTC 2012 - lnussel@suse.de
 

aaa_base.spec

@@ -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 @@ Requires:       filesystem distribution-release /bin/mktemp /usr/bin/find /usr/b
 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 @@ This package installs several important configuration files. Central
 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 @@ and convenience hacks).
 
 %prep
 %setup -n aaa_base
+%patch1 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}