--- a/MozillaFirefox/MozillaFirefox.spec Sat Sep 19 22:04:22 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sat Oct 31 20:58:31 2015 +0100
@@ -18,10 +18,10 @@
# changed with every update
-%define major 40
+%define major 41
%define mainver %major.99
%define update_channel beta
-%define releasedate 2015091100
+%define releasedate 2015103000
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -76,8 +76,8 @@
BuildRequires: libnotify-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
-BuildRequires: mozilla-nspr-devel >= 4.10.8
-BuildRequires: mozilla-nss-devel >= 3.19.2
+BuildRequires: mozilla-nspr-devel >= 4.10.10
+BuildRequires: mozilla-nss-devel >= 3.19.4
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: startup-notification-devel
@@ -107,6 +107,10 @@
%endif
Provides: web_browser
Provides: browser(npapi)
+%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
@@ -133,20 +137,17 @@
Source15: firefox-appdata.xml
Source16: MozillaFirefox.changes
# Gecko/Toolkit
-Patch1: toolkit-download-folder.patch
-Patch2: mozilla-nongnome-proxies.patch
-Patch4: mozilla-shared-nss-db.patch
-Patch5: mozilla-kde.patch
-Patch6: mozilla-preferences.patch
-Patch7: mozilla-language.patch
-Patch8: mozilla-ntlm-full-path.patch
-Patch9: mozilla-repo.patch
-Patch10: mozilla-icu-strncat.patch
-Patch11: mozilla-arm-disable-edsp.patch
-Patch12: mozilla-openaes-decl.patch
-Patch14: mozilla-skia-be-le.patch
-Patch15: mozilla-bmo1005535.patch
-Patch16: mozilla-no-stdcxx-check.patch
+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-repo.patch
+Patch8: mozilla-openaes-decl.patch
+Patch9: mozilla-bmo1005535.patch
+Patch10: mozilla-no-stdcxx-check.patch
+Patch11: mozilla-libproxy.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
@@ -248,18 +249,15 @@
cd $RPM_BUILD_DIR/mozilla
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
+#%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
# Firefox
%patch101 -p1
%patch102 -p1
@@ -312,7 +310,6 @@
ac_add_options --mandir=%{_mandir}
ac_add_options --includedir=%{_includedir}
ac_add_options --enable-release
-ac_add_options --enable-stdcxx-compat
%ifarch %ix86 %arm
%if 0%{?suse_version} > 1230
ac_add_options --disable-optimize