diff -r d14085eee2b2 -r 4b419fce88dc MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Jan 20 21:27:34 2018 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Fri Feb 09 13:28:07 2018 +0100 @@ -18,11 +18,11 @@ # changed with every update -%define major 57 +%define major 58 %define mainver %major.99 %define update_channel beta %define branding 1 -%define releasedate 20180108140638 +%define releasedate 20180208193705 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -42,10 +42,8 @@ %define gnome_dir %{_prefix} %define desktop_file_name %{progname} %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%define _use_internal_dependency_generator 0 -%define __find_requires sh %{SOURCE4} -%global provfind sh -c "grep -v '.so' | %__find_provides" -%global __find_provides %provfind +%define __provides_exclude ^lib.*\\.so.*$ +%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*)$ %define localize 1 %ifarch %ix86 x86_64 %define crashreporter 1 @@ -72,11 +70,11 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.17 -BuildRequires: mozilla-nss-devel >= 3.34.1 +BuildRequires: mozilla-nspr-devel >= 4.18 +BuildRequires: mozilla-nss-devel >= 3.35 BuildRequires: python-devel BuildRequires: python2-xml -BuildRequires: rust >= 1.21 +BuildRequires: rust >= 1.22.1 BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip @@ -126,7 +124,6 @@ Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in -Source4: find-external-requires.sh Source5: source-stamp.txt Source6: kde.js Source7: l10n-%{version}.tar.xz @@ -153,6 +150,9 @@ Patch5: mozilla-no-stdcxx-check.patch Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch +Patch8: mozilla-enable-csd.patch +Patch9: mozilla-bmo256180.patch +Patch10: mozilla-alsa-sandbox.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -263,6 +263,9 @@ %patch6 -p1 %endif %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 # Firefox %patch101 -p1 %patch102 -p1