From 79cd903e6ab3d11fea860defc2dc5a8e6644126610783fc85daf18d4676e5b0e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 18 Jun 2007 22:19:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=11

---
 MozillaFirefox.changes |  5 +++++
 MozillaFirefox.spec    |  4 +++-
 mozilla.sh.in          | 18 ++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 7dab5f8f..0a8a2de6 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 18 13:22:42 CDT 2007 - maw@suse.de
+
+- Use mozilla.sh.in from the build service (#230681).
+
 -------------------------------------------------------------------
 Tue Jun  5 15:55:08 CEST 2007 - sbrabec@suse.cz
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index cba3dd13..76ac66e8 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -26,7 +26,7 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 Obsoletes:      mozilla
 %endif
 Version:        2.0.0.4
-Release:        2
+Release:        9
 Summary:        Mozilla Firefox Web Browser
 URL:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -551,6 +551,8 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 18 2007 - maw@suse.de
+- Use mozilla.sh.in from the build service (#230681).
 * Tue Jun 05 2007 - sbrabec@suse.cz
 - Removed invalid desktop category "Application" (#254654).
 * Mon Jun 04 2007 - maw@suse.de
diff --git a/mozilla.sh.in b/mozilla.sh.in
index 772f996d..3849be24 100644
--- a/mozilla.sh.in
+++ b/mozilla.sh.in
@@ -60,15 +60,10 @@ MOZ_APPNAME="%APPNAME"
 MOZ_PROFILE="%PROFILE"
 MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME-bin"
 
-mozilla_lib=`file $MOZ_PROGRAM | awk '{ print $3 }'`
-case $mozilla_lib in
-  64-bit)
-      LIB=lib64
-      ;;
-  *)
-      LIB=lib
-      ;;
-esac
+mozilla_lib=`file $MOZ_PROGRAM`
+LIB=lib
+echo $mozilla_lib | grep -q -E 'x86-64|s390x|ppc64' && LIB=lib64
+
 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins
 if [ ! -d $BROWSER_PLUGIN_DIR ]; then
   BROWSER_PLUGIN_DIR=/opt/netscape/plugins
@@ -79,9 +74,12 @@ fi
 #
 export FLASH_GTK_LIBRARY=libgtk-x11-2.0.so.0
 
-# ignore composite extension
+# ignore composite extension (needed for Flash)
 export XLIB_SKIP_ARGB_VISUALS=1
 
+# needed for SUN Java under Xorg >= 7.2
+export LIBXCB_ALLOW_SLOPPY_LOCK=1
+
 # Pango support
 if [ -z "$MOZ_ENABLE_PANGO" -a -z "$MOZ_DISABLE_PANGO" ]; then
   case "${LC_ALL-${LC_CTYPE-${LANG-en_US}}}" in