mozilla: comparison xulrunner/xulrunner.spec

equal deleted inserted replaced

-:de015e47b365
+:b8a9179c123d
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.9.0
 BuildRequires:  mozilla-nss-devel >= 3.13.4
 Version:        12.99
 Release:        0
-%define         releasedate 2012042500
+%define         releasedate 2012050900
 %define         version_internal 13.0
 %define         apiversion 13
 %define         uaweight 1300000
 Summary:        Mozilla Runtime Environment
 License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-pkgconfig.patch
 Patch3:         idldir.patch
 Patch4:         mozilla-nongnome-proxies.patch
 Patch5:         mozilla-prefer_plugin_pref.patch
-Patch9:         mozilla-language.patch
+Patch6:         mozilla-language.patch
-Patch11:        mozilla-ntlm-full-path.patch
+Patch7:         mozilla-ntlm-full-path.patch
-Patch12:        mozilla-dump_syms-static.patch
+Patch8:         mozilla-dump_syms-static.patch
-Patch13:        mozilla-sle11.patch
+Patch9:         mozilla-sle11.patch
-Patch14:        mozilla-linux3.patch
+Patch10:        mozilla-linux3.patch
-Patch15:        mozilla-arm-cpu-detection.patch
+Patch11:        mozilla-disable-neon-option.patch
-Patch16:        mozilla-system-nspr.patch
+Patch12:        mozilla-system-nspr.patch
-Patch17:        mozilla-revert_621446.patch
+Patch13:        mozilla-revert_621446.patch
-Patch18:        mozilla-yarr-pcre.patch
+Patch14:        mozilla-yarr-pcre.patch
-Patch19:        mozilla-libnotify.patch
+Patch15:        mozilla-libnotify.patch
-Patch20:        mozilla-gcc47.patch
+Patch16:        mozilla-gcc47.patch
+Patch17:        mozilla-nsSound.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
 Requires(preun): update-alternatives coreutils
 ### build configuration ###
 %define has_system_nspr  1
 %define has_system_nss   1
 %define has_system_cairo 0
 %define localize 0
-%ifarch ppc ppc64 s390 s390x ia64
+%ifarch ppc ppc64 s390 s390x ia64 %arm
 %define crashreporter    0
 %define plugincontainer  0
 %else
 %define crashreporter    1
 %define plugincontainer  1
+%endif
+# temporary gcc 4.7
+%if %suse_version > 1210
+%define crashreporter 0
 %endif
 ### configuration end ###
 %define _use_internal_dependency_generator 0
 %define __find_requires sh %{SOURCE2}
 %global provfind sh -c "grep -Ev 'mozsqlite3|dbusservice|unixprint' | %__find_provides"
 %package translations-other
 Summary:        Extra translations for XULRunner
 Group:          System/Localization
 Requires:       %{name} = %{version}
-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)
 Obsoletes:      %{name}-translations < %{version}-%{release}
 %description translations-other
 XULRunner is a single installable package that can be used to bootstrap
 multiple XUL+XPCOM applications that are as rich as Firefox and
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%if %suse_version < 1120
 %patch9 -p1
+%endif
+%patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%if %suse_version < 1120
+#%patch13 -p1
-%patch13 -p1
+#%patch14 -p1
-%endif
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
-#%patch17 -p1
+%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
 %build
 # no need to add build time to binaries
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 EOF
 %endif
 # ARM
 %ifarch %arm
 cat << EOF >> $MOZCONFIG
-%ifarch armv7l
+ac_add_options --disable-neon
-ac_add_options --with-arch=armv7-a
-ac_add_options --with-float-abi=hard
-ac_add_options --with-fpu=vfpv3-d16
-ac_add_options --with-thumb=yes
-%endif
-%ifarch armv5tel
-ac_add_options --with-arch=armv5te
-ac_add_options --with-float-abi=soft
-ac_add_options --with-thumb=no
-%endif
 EOF
 %endif
 make -f client.mk build
 %install

branch	firefox13
changeset 445	b8a9179c123d
parent 436	0d065e025384
child 446	e0ab7119246f