diff -r 096e59808e91 -r ff9e20146e8b MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Jan 21 12:37:55 2017 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Sun Feb 12 08:57:22 2017 +0100 @@ -18,10 +18,10 @@ # changed with every update -%define major 50 +%define major 51 %define mainver %major.99 %define update_channel beta -%define releasedate 20170117000000 +%define releasedate 20170111000000 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -36,7 +36,7 @@ %define pkgname firefox-dev-edition %define appname Firefox Developer Edition %endif -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1320 %define firefox_use_gtk3 1 %endif %define progdir %{_prefix}/%_lib/%{progname} @@ -78,7 +78,7 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.13.1 -BuildRequires: mozilla-nss-devel >= 3.28.1 +BuildRequires: mozilla-nss-devel >= 3.28.2 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -150,6 +150,8 @@ Patch13: mozilla-check_return.patch Patch14: mozilla-skia-overflow.patch Patch17: mozilla-binutils-visibility.patch +Patch18: mozilla-skia-ppc-endianess.patch +Patch19: mozilla-disable-skia-be.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -205,7 +207,7 @@ %package translations-other Summary: Extra translations for %{appname} Group: System/Localization -Provides: locale(%{name}:ach;af;an;as;ast;az;be;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) +Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -264,6 +266,8 @@ %patch13 -p1 %patch14 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -398,9 +402,9 @@ %if %localize rm -f %{_tmppath}/translations.* touch %{_tmppath}/translations.{common,other} -for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do +for locale in $(awk '{ print $1; }' %{SOURCE17}); do case $locale in - ja-JP-mac|en-US) + ja-JP-mac|en-US|'') ;; *) pushd $RPM_BUILD_DIR/compare-locales