# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1335338567 -7200
# Node ID c50d6cb495a0ec7452649a493033d7fff2f6f3bd
# Parent  dd8c5e0a92822de964ad301a2dcab51bf8f505ef
manually merge changes from release channel
updated release data in spec file

diff -r dd8c5e0a9282 -r c50d6cb495a0 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Apr 25 09:21:50 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Apr 25 09:22:47 2012 +0200
@@ -19,7 +19,7 @@
 
 %define major 12
 %define mainver %major.99
-%define update_channel aurora
+%define update_channel beta
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -49,7 +49,7 @@
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012041400
+%define         releasedate 2012042500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -124,12 +124,16 @@
 %define desktop_file_name %{name}
 %endif
 ### build options
-%define branding 0
+%define branding 1
 %define localize 1
 %ifarch ppc ppc64 s390 s390x ia64 %arm
-%define crashreporter    0
+%define crashreporter 0
 %else
-%define crashreporter    1
+%define crashreporter 1
+%endif
+# temporary gcc 4.7
+%if %suse_version > 1210
+%define crashreporter 0
 %endif
 ### build options end
 
@@ -165,7 +169,7 @@
 %package translations-other
 Summary:        Extra translations for MozillaFirefox
 Group:          System/Localization
-Provides:       locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu)
+Provides:       locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu)
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}