# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1339135514 -7200
# Node ID c0ae7c025b78548b5ccac596f1f51c9041f73070
# Parent  916711b0f1d698dfe11125eceea3dc96b32a8f33# Parent  c49024069c9d745b4bdf08e051a8c70fb0715945
merge from firefox14

diff -r 916711b0f1d6 -r c0ae7c025b78 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 07:09:00 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 08:05:14 2012 +0200
@@ -435,7 +435,6 @@
 rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE
 rm -f $RPM_BUILD_ROOT%{progdir}/precomplete
 rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US*
-rm -f $RPM_BUILD_ROOT%{progdir}/firefox
 rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini
 # devel
 mkdir -p %{buildroot}%{_bindir}
@@ -543,6 +542,7 @@
 %{progdir}/jssubloader/
 %{progdir}/searchplugins/
 %attr(755,root,root) %{progdir}/%{progname}.sh
+%{progdir}/firefox
 %{progdir}/firefox-bin
 %{progdir}/add-plugins.sh
 %{progdir}/application.ini
diff -r 916711b0f1d6 -r c0ae7c025b78 MozillaFirefox/mozilla.sh.in
--- a/MozillaFirefox/mozilla.sh.in	Fri Jun 08 07:09:00 2012 +0200
+++ b/MozillaFirefox/mozilla.sh.in	Fri Jun 08 08:05:14 2012 +0200
@@ -133,10 +133,7 @@
   trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
   echo -e "set args ${1+"$@"}\nrun" > $tmpfile
   echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
-  $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
+  exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
 else
-  $MOZ_PROGRAM "$@"
+  exec $MOZ_PROGRAM "$@"
 fi
-exitcode=$?
-
-exit $exitcode