rpms/firefox/FC-3 firefox.sh.in,1.4,1.5 firefox.spec,1.44,1.45

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/firefox/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv13333

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
remove JVM version probing (#116445)



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/firefox.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefox.sh.in	23 Apr 2005 05:15:52 -0000	1.4
+++ firefox.sh.in	28 Apr 2005 05:04:41 -0000	1.5
@@ -84,62 +84,6 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
-# Figure out if we need to set LD_ASSUME_KERNEL for older versions of the JVM.
-
-function set_jvm_vars() {
-
-    # see if the jvm exists in either of the locations
-    if [ -L $MOZ_DIST_BIN/plugins/libjavaplugin_oji.so ]; then
-        JVM_ORIG_LINK=$MOZ_DIST_BIN/plugins/libjavaplugin_oji.so
-    fi
-
-    if [ -L LIBDIR/mozilla/plugins/libjavaplugin_oji.so ]; then
-        JVM_ORIG_LINK=LIBDIR/mozilla/plugins/libjavaplugin_oji.so
-    fi
-
-    if [ -z "$JVM_ORIG_LINK" ]; then
-        return;
-    fi
-
-    JVM_LINK=`perl -e "print readlink('$JVM_ORIG_LINK')"`
-
-    # is it relative?  if so append the full path
-
-    echo "${JVM_LINK}" | grep -e "^/" 2>&1 > /dev/null
-
-    if [ "$?" -ne "0" ]; then
-	JVM_LINK=$MOZ_DIST_BIN/plugins/${JVM_LINK}
-    fi
-
-    JVM_BASE=`basename $JVM_LINK`
-    JVM_DIR=`echo $JVM_LINK | sed -e s/$JVM_BASE//g`
-    JVM_COMMAND=$JVM_DIR/java
-    if [ ! -r $JVM_COMMAND ]; then
-       JVM_DIR=${JVM_DIR}../../../bin/
-       JVM_COMMAND=$JVM_DIR/java
-       # does the command exist?
-       if [ ! -r "$JVM_COMMAND" ]; then
-           return
-       fi
-    fi
-
-    # export this temporarily - it seems to work with old and new
-    # versions of the JVM.
-    export LD_ASSUME_KERNEL=2.2.5
-
-    # get the version
-    JVM_VERSION=`$JVM_COMMAND -version 2>&1 | grep version | cut -f 3 -d " " | sed -e 's/\"//g'`
-
-    unset LD_ASSUME_KERNEL
-
-    case "$JVM_VERSION" in
-	(1.3.0*)
-	# bad JVM
-	export LD_ASSUME_KERNEL=2.2.5
-	;;
-    esac
-}
-
 function check_running() {
     $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?
@@ -172,9 +116,6 @@
 
 # OK, here's where all the real work gets done
 
-# set our JVM vars
-set_jvm_vars
-
 # check to see if there's an already running instance or not
 ALREADY_RUNNING=`check_running`
 


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-3/firefox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- firefox.spec	17 Apr 2005 03:22:01 -0000	1.44
+++ firefox.spec	28 Apr 2005 05:04:41 -0000	1.45
@@ -278,6 +278,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Apr 27 2005 Warren Togami <wtogami at redhat.com>
+- remove JVM version probing (#116445)
+
 * Sat Apr 16 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.3-1.3.1
 - Firefox 1.0.3
 - Update useragent patch to match upstream.