summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Aillon <caillon@fedoraproject.org>2007-12-22 02:19:59 +0000
committerChristopher Aillon <caillon@fedoraproject.org>2007-12-22 02:19:59 +0000
commit557e35af96add6cc248dc41c138c3ee12d826023 (patch)
tree7320339387198eca9e45dddf9cbf619cec8c0c84
parentfixed xulrunner dependency (diff)
downloadlibrewolf-fedora-ff-557e35af96add6cc248dc41c138c3ee12d826023.tar.gz
librewolf-fedora-ff-557e35af96add6cc248dc41c138c3ee12d826023.tar.bz2
librewolf-fedora-ff-557e35af96add6cc248dc41c138c3ee12d826023.zip
- When there are both 32- and 64-bit versions of XPCOM installed on disk
make sure to load the correct one.
-rw-r--r--firefox.sh.in9
-rw-r--r--firefox.spec6
2 files changed, 14 insertions, 1 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index fd17d98..17c4562 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -65,6 +65,15 @@ MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/firefox-xremote-client"
MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
##
+## Set MOZ_GRE_CONF
+##
+MOZ_GRE_CONF=/etc/gre.d/gre.conf
+if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then
+ MOZ_GRE_CONF=/etc/gre.d/gre64.conf
+fi
+export MOZ_GRE_CONF
+
+##
## Set MOZILLA_FIVE_HOME
##
MOZILLA_FIVE_HOME="$MOZ_DIST_BIN"
diff --git a/firefox.spec b/firefox.spec
index 47f57e9..a59d303 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 3.0
-Release: 0.beta2.2%{?dist}
+Release: 0.beta2.3%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -311,6 +311,10 @@ fi
#---------------------------------------------------------------------
%changelog
+* Sat Dec 22 2007 Christopher Aillon <caillon@redhat.com> 3.0-0.beta2.3
+- When there are both 32- and 64-bit versions of XPCOM installed on disk
+ make sure to load the correct one.
+
* Tue Dec 20 2007 Martin Stransky <stransky@redhat.com> 3.0-0.beta2.2
- fixed xulrunner dependency
bgstack15