merge from firefox14
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 08 Jun 2012 08:05:14 +0200
changeset 466 c0ae7c025b78
parent 463 916711b0f1d6 (current diff)
parent 465 c49024069c9d (diff)
child 467 a9baaad57fa4
merge from firefox14
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
--- 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