rpms/firefox/devel firefox.sh.in, 1.27, 1.28 firefox.spec, 1.220, 1.221

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21951

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
* Sat Dec 22 2007 Christopher Aillon <caillon at 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.



Index: firefox.sh.in
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- firefox.sh.in	19 Dec 2007 15:00:47 -0000	1.27
+++ firefox.sh.in	22 Dec 2007 02:19:59 -0000	1.28
@@ -65,6 +65,15 @@
 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"


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- firefox.spec	20 Dec 2007 10:31:27 -0000	1.220
+++ firefox.spec	22 Dec 2007 02:19:59 -0000	1.221
@@ -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 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Dec 22 2007 Christopher Aillon <caillon at 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 at redhat.com> 3.0-0.beta2.2
 - fixed xulrunner dependency