- avoid shell childs when running in non-debug mode

Changed files:
    mozilla-firefox-bin.spec -> 1.64
    nochilds.patch -> 1.1

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 15dc5889265a48656e55e661ee6a27f92ff99379..63132ce6623d874766389370c4c1a41da969b4a0 100644 (file)
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -15,7 +15,7 @@ Summary:      Mozilla Firefox web browser
 Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
 Name:          mozilla-firefox-bin
 Version:       3.6.8
-Release:       0.3
+Release:       0.4
 License:       MPL/LGPL
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
@@ -24,6 +24,7 @@ Source1:      %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-agent.patch
 Patch1:                %{name}-ti-agent.patch
+Patch2:                nochilds.patch
 URL:           http://www.mozilla.org/projects/firefox/
 BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: zip
@@ -61,12 +62,14 @@ Mozilla Firefox jest open sourcową przeglądarką sieci WWW, stworzoną z
 myślą o zgodności ze standardami, wydajnością i przenośnością.
 
 %prep
-%setup -q -n %{realname}
+%setup -qcT
+%{__tar} jxf %{SOURCE0} --strip-components=1
 %if "%{pld_release}" == "th"
 %patch0 -p0
 %endif
 %if "%{pld_release}" == "ti"
 %patch1 -p0
+%patch2 -p1
 %endif
 
 %install

diff --git a/nochilds.patch b/nochilds.patch
new file mode 100644 (file)
index 0000000..9a1204b
--- /dev/null
+++ b/nochilds.patch
@@ -0,0 +1,27 @@
+--- mozilla-firefox-bin-3.6.8/firefox  2010-07-23 01:31:13.000000000 +0300
++++ mozilla-firefox-bin-3.6.8/firefox  2010-08-18 10:26:59.365912397 +0300
+@@ -135,8 +135,11 @@
+ if [ $debugging = 1 ]
+ then
+   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++  "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++else
++  exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++  # NORETURN
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+ exitcode=$?
+ 
+ exit $exitcode
+--- mozilla-firefox-bin-3.6.8/run-mozilla.sh   2010-07-23 01:31:13.000000000 +0300
++++ mozilla-firefox-bin-3.6.8/run-mozilla.sh   2010-08-18 10:24:42.485849818 +0300
+@@ -140,7 +140,8 @@
+       ##
+       ## Run the program
+       ##
+-      "$prog" ${1+"$@"}
++      exec "$prog" ${1+"$@"}
++      # NORETURN
+       exitcode=$?
+ }
+ ##########################################################################