rpms/firefox/devel firefox.sh.in, 1.12, 1.13 firefox.spec, 1.147, 1.148

[fedora-cvs-commits at redhat.com]

Author: caillon

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

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
- Build with -rpath (#161958)



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- firefox.sh.in	29 Aug 2006 02:38:26 -0000	1.12
+++ firefox.sh.in	30 Aug 2006 07:07:54 -0000	1.13
@@ -53,20 +53,9 @@
 
 export MOZILLA_FIVE_HOME
 
-##
-## Set LD_LIBRARY_PATH
-##
-if [ "$LD_LIBRARY_PATH" ]
-then
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins
-fi
-
-export LD_LIBRARY_PATH
 
 ##
-## Make sure that we set the plugin path for backwards compatibility
+## Make sure that we set the plugin path
 ##
 if [ "$MOZ_PLUGIN_PATH" ]
 then


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- firefox.spec	29 Aug 2006 02:38:27 -0000	1.147
+++ firefox.spec	30 Aug 2006 07:07:54 -0000	1.148
@@ -166,7 +166,7 @@
 %define moz_make_flags %{?_smp_mflags}
 %endif
 
-MAKE="gmake %{moz_make_flags}" make -f client.mk build
+LDFLAGS="-Wl,-rpath,%{ffdir}" MAKE="gmake %{moz_make_flags}" make -f client.mk build
 
 #---------------------------------------------------------------------
 
@@ -356,7 +356,10 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 1.5.0.6-9
+* Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-9
+- Build with -rpath (#161958)
+
+* Mon Aug 28 2006 Behdad Esfahbod <besfahbo at redhat.com> 
 - Remove "Pango breaks MathML" from firefox.sh.in
 
 * Mon Aug 28 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.6-8