diff -r 2faa589360df -r 8df86bf11fc1 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Nov 15 09:35:28 2020 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Dec 10 14:36:59 2020 +0100 @@ -29,15 +29,15 @@ # orig_suffix b3 # major 69 # mainver %major.99 -%define major 82 -%define mainver %major.0.3 -%define orig_version 82.0.3 +%define major 83 +%define mainver %major.0 +%define orig_version 83.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 %define devpkg 1 -# PGO builds do not work in TW currently (bmo#1642410) +# PGO builds do not work in TW currently (bmo#1680306) %define do_profiling 0 # upstream default is clang (to use gcc for large parts set to 0) @@ -101,9 +101,9 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.29 -BuildRequires: mozilla-nss-devel >= 3.57 +BuildRequires: mozilla-nss-devel >= 3.58 BuildRequires: nasm >= 2.14 -BuildRequires: nodejs10 >= 10.21.0 +BuildRequires: nodejs10 >= 10.22.1 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 BuildRequires: python-libxml2 BuildRequires: python36 @@ -178,6 +178,7 @@ Source14: https://github.com/openSUSE/firefox-scripts/raw/5e54f4a/create-tar.sh Source15: firefox-appdata.xml Source16: %{name}.changes +Source17: firefox-search-provider.ini # Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, # please get your own set of keys. @@ -195,7 +196,6 @@ Patch8: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch Patch9: mozilla-s390-context.patch Patch11: mozilla-reduce-rust-debuginfo.patch -Patch12: mozilla-ppc-altivec_static_inline.patch Patch13: mozilla-bmo1005535.patch Patch14: mozilla-bmo1568145.patch Patch15: mozilla-bmo1504834-part1.patch @@ -336,7 +336,6 @@ %patch8 -p1 %patch9 -p1 %patch11 -p1 -%patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 @@ -656,6 +655,9 @@ # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 +# install GNOME Shell search provider +mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers +cp %{SOURCE17} %{buildroot}%{_datadir}/gnome-shell/search-providers ########## # ADDONS # @@ -776,6 +778,9 @@ %endif %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml +%dir %{_datadir}/gnome-shell +%dir %{_datadir}/gnome-shell/search-providers +%{_datadir}/gnome-shell/search-providers/*.ini %dir %{_datadir}/mozilla %dir %{_datadir}/mozilla/extensions %dir %{_datadir}/mozilla/extensions/%{firefox_appid}