[xulrunner: 1/2] Update to 5.0 - mozilla-639554

[Martin Stransky]

commit 11a265a34235bdcdfcd58e79b7a0fdf6a8b97195
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Aug 16 12:20:44 2011 +0200

    Update to 5.0 - mozilla-639554

 mozilla-639554.patch |   15 +++++++++++++++
 xulrunner.spec       |    2 ++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/mozilla-639554.patch b/mozilla-639554.patch
new file mode 100644
index 0000000..12d32b2
--- /dev/null
+++ b/mozilla-639554.patch
@@ -0,0 +1,15 @@
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -621,10 +621,12 @@ ifdef INSTALL_SDK # Here comes the hard
+ 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
diff --git a/xulrunner.spec b/xulrunner.spec
index 96d3f8a..7b776f0 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -92,6 +92,7 @@ Patch24:        crashreporter-remove-static.patch
 # Upstream patches
 Patch34:        xulrunner-2.0-network-link-service.patch
 Patch35:        xulrunner-2.0-NetworkManager09.patch
+Patch36:        mozilla-639554.patch
 
 # ---------------------------------------------------
 
@@ -219,6 +220,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 
 %patch34 -p1 -b .network-link-service
 %patch35 -p1 -b .NetworkManager09
+%patch36 -p1 -b .639554
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig