[xulrunner/f16] Update to xulrunner 15b6

[Martin Stransky]

commit f86b2101162168629647a961e312fa4acf2f6452
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Aug 22 13:46:10 2012 +0200

    Update to xulrunner 15b6

 crashreporter-remove-static.patch |   11 --
 mozilla-691898.patch              |  288 -------------------------------------
 mozilla-750620.patch              |   33 -----
 xulrunner-10.0-gcc47.patch        |   13 --
 xulrunner-15.0-gcc47.patch        |   13 ++
 xulrunner.spec                    |   20 +--
 6 files changed, 21 insertions(+), 357 deletions(-)
---
diff --git a/xulrunner-15.0-gcc47.patch b/xulrunner-15.0-gcc47.patch
new file mode 100644
index 0000000..0d44796
--- /dev/null
+++ b/xulrunner-15.0-gcc47.patch
@@ -0,0 +1,13 @@
+diff -up xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in
+--- xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47	2012-08-15 07:48:31.000000000 +0200
++++ xulrunner-15.0/mozilla-beta/toolkit/crashreporter/client/Makefile.in	2012-08-20 15:05:41.782947739 +0200
+@@ -34,6 +34,9 @@ CPPSRCS = \
+   crashreporter.cpp \
+   $(NULL)
+ 
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += crashreporter_win.cpp
+ LIBS += \
diff --git a/xulrunner.spec b/xulrunner.spec
index 5f5dfd1..b2f458c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -37,7 +37,7 @@
 # rc_version    should be set to the RC number if using an RC, 0 otherwise
 %global gecko_dir_ver 2
 %global alpha_version 0
-%global beta_version  0
+%global beta_version  6
 %global rc_version    0
 
 %global mozappdir     %{_libdir}/%{name}-%{gecko_dir_ver}
@@ -72,8 +72,8 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        14.0.1
-Release:        6%{?pre_tag}%{?dist}
+Version:        15.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -90,18 +90,15 @@ Patch14:        xulrunner-2.0-chromium-types.patch
 %if 0%{?fedora} <= 15
 Patch16:        add-gtkmozembed-11.0.patch
 %endif
-Patch17:        xulrunner-10.0-gcc47.patch
+Patch17:        xulrunner-15.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
 Patch18:        xulrunner-12.0-jemalloc-ppc.patch
 
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
-Patch24:        crashreporter-remove-static.patch
 
 # Upstream patches
-Patch47:        mozilla-691898.patch
 Patch49:        mozilla-746112.patch
-Patch50:        mozilla-750620.patch
 Patch51:        mozilla-709732-gfx-icc-profile-fix.patch
 
 # ---------------------------------------------------
@@ -233,17 +230,14 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %if 0%{?fedora} <= 15
 %patch16 -p2 -b .gtkmozembed
 %endif
-%patch17 -p1 -b .gcc47
+%patch17 -p2 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
 
 %patch20 -p2 -b .pk
-%patch24 -p1 -b .static
 
-%patch47 -p2 -b .691898
 %ifarch ppc ppc64
 %patch49 -p2 -b .746112
 %endif
-%patch50 -p1 -b .750620
 %patch51 -p1 -b .709732
 
 %{__rm} -f .mozconfig
@@ -481,7 +475,6 @@ fi
 %{mozappdir}/mozilla-xremote-client
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/xulrunner
-%{mozappdir}/xulrunner-bin
 %{mozappdir}/xulrunner-stub
 %{mozappdir}/platform.ini
 %{mozappdir}/dependentlibs.list
@@ -508,6 +501,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 22 2012 Martin Stransky <stransky at redhat.com> - 15.0-1
+- Update to 15.0
+
 * Thu Aug  9 2012 Jan Horak <jhorak at redhat.com> - 14.0.1-6
 - Added fix for mozbz#709732