--- a/MozillaFirefox/MozillaFirefox.spec Mon Apr 17 09:40:14 2017 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Jun 04 09:56:53 2017 +0200
@@ -18,10 +18,11 @@
# changed with every update
-%define major 52
+%define major 53
%define mainver %major.99
%define update_channel beta
-%define releasedate 20170404000000
+%define branding 1
+%define releasedate 20170602000000
# PIE, full relro (x86_64 for now)
%define build_hardened 1
@@ -33,15 +34,9 @@
%endif
# general build definitions
-%if "%{update_channel}" != "aurora"
%define progname firefox
%define pkgname MozillaFirefox
%define appname Firefox
-%else
-%define progname firefox-dev
-%define pkgname firefox-dev-edition
-%define appname Firefox Developer Edition
-%endif
%define progdir %{_prefix}/%_lib/%{progname}
%define gnome_dir %{_prefix}
%define desktop_file_name %{progname}
@@ -54,11 +49,6 @@
# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution,
# please get your own set of keys.
%define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q
-%if %update_channel == "aurora"
-%define branding 0
-%else
-%define branding 1
-%endif
%define localize 1
%ifarch %ix86 x86_64
%define crashreporter 1
@@ -117,10 +107,8 @@
Provides: firefox = %{version}-%{release}
%endif
Provides: web_browser
-%if "%{update_channel}" != "aurora"
Provides: appdata()
Provides: appdata(firefox.appdata.xml)
-%endif
# this is needed to match this package with the kde4 helper package without the main package
# having a hard requirement on the kde4 package
%define kde_helper_version 6
@@ -147,11 +135,11 @@
Source15: firefox-appdata.xml
Source16: MozillaFirefox.changes
Source17: l10n_changesets.txt
+Source18: mozilla-api-key
# Gecko/Toolkit
Patch1: mozilla-nongnome-proxies.patch
Patch2: mozilla-shared-nss-db.patch
Patch3: mozilla-kde.patch
-Patch4: mozilla-preferences.patch
Patch5: mozilla-language.patch
Patch6: mozilla-ntlm-full-path.patch
Patch7: mozilla-openaes-decl.patch
@@ -179,6 +167,7 @@
%if 0%{?suse_version} < 1220
Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7
%endif
+##BuildArch: i686 x86_64 aarch64 ppc64le
%description
Mozilla Firefox is a standalone web browser, designed for standards
@@ -261,12 +250,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-#%patch9 -p1
+%ifarch %ix86
+%patch9 -p1
+%endif
%patch10 -p1
# Firefox
%patch101 -p1
@@ -299,9 +289,9 @@
export CC=gcc-5
%endif
export CFLAGS="%{optflags} -fno-strict-aliasing"
-# boo#986541: add -fno-delete-null-pointer-checks and -fno-inline-small-functions for gcc6
+# boo#986541: add -fno-delete-null-pointer-checks for gcc6
%if 0%{?suse_version} > 1320
-export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-inline-small-functions"
+export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
%endif
%ifarch %arm
export CFLAGS="${CFLAGS/-g / }"
@@ -338,6 +328,10 @@
%if 0%{?build_hardened}
ac_add_options --enable-pie
%endif
+# gcc7 (boo#104105)
+%if 0%{?suse_version} > 1320
+ac_add_options --enable-optimize="-g -O2"
+%endif
%ifarch %ix86 %arm
%if 0%{?suse_version} > 1230
ac_add_options --disable-optimize
@@ -361,6 +355,7 @@
ac_add_options --enable-startup-notification
#ac_add_options --enable-chrome-format=jar
ac_add_options --enable-update-channel=%{update_channel}
+ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
%if %branding
ac_add_options --enable-official-branding
%endif
@@ -465,10 +460,8 @@
mkdir -p %{buildroot}%{_datadir}/mime/packages
cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml
# appdata
-%if "%{update_channel}" != "aurora"
mkdir -p %{buildroot}%{_datadir}/appdata
cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml
-%endif
# install man-page
mkdir -p %{buildroot}%{_mandir}/man1/
cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1
@@ -613,9 +606,7 @@
%{gnome_dir}/share/icons/hicolor/
%{_bindir}/%{progname}
%doc %{_mandir}/man1/%{progname}.1.gz
-%if "%{update_channel}" != "aurora"
%{_datadir}/appdata/
-%endif
%files devel
%defattr(-,root,root)