rpms/mozilla/FC-3 mozilla.sh.in,1.6,1.7 mozilla.spec,1.44,1.45

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	mozilla.sh.in mozilla.spec 
Log Message:
- remove JVM version probing (#116445)
- correct confusing PANGO vars in startup script



Index: mozilla.sh.in
===================================================================
RCS file: /cvs/dist/rpms/mozilla/FC-3/mozilla.sh.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mozilla.sh.in	22 Mar 2005 22:50:36 -0000	1.6
+++ mozilla.sh.in	28 Apr 2005 05:13:46 -0000	1.7
@@ -74,66 +74,11 @@
 export MOZ_PLUGIN_PATH
 
 ##
-## Set MOZ_ENABLE_PANGO
+## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
+## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
 ##
-MOZ_ENABLE_PANGO=1
-export MOZ_ENABLE_PANGO
-
-# Figure out if we need to ser 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 LIBDIR/mozilla-MOZILLA_VERSION/plugins/libjavaplugin_oji.so ]; then
-        JVM_ORIG_LINK=LIBDIR/mozilla-MOZILLA_VERSION/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=LIBDIR/mozilla-MOZILLA_VERSION/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
-}
+#MOZ_DISABLE_PANGO=1
+#export MOZ_DISABLE_PANGO
 
 function check_running() {
     $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
@@ -167,9 +112,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: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/FC-3/mozilla.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mozilla.spec	17 Apr 2005 19:10:28 -0000	1.44
+++ mozilla.spec	28 Apr 2005 05:13:46 -0000	1.45
@@ -768,6 +768,10 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Wed Apr 27 2005 Warren Togami <wtogami at redhat.com>
+- remove JVM version probing (#116445)
+- correct confusing PANGO vars in startup script
+
 * Sat Apr 16 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.7-1.3.1
 - Update to 1.7.7
 - Add nspr-config 64 bit patch from rstrode at redhat.com