diff --git a/.gitattributes b/.gitattributes index e7f6186a96a216f70d73fd41392162cdacf5dcc0..91f530a27862313fb8ba3e86e77526fdcaffe22b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -firefox-91.4.0esr.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text +firefox-91.5.0esr.processed-source.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/firefox-91.4.0esr.processed-source.tar.xz b/firefox-91.5.0esr.processed-source.tar.xz similarity index 32% rename from firefox-91.4.0esr.processed-source.tar.xz rename to firefox-91.5.0esr.processed-source.tar.xz index 3c588ee0cf920c32a8920fd1e0b3e3d7ff5448b0..582bfcd10055580fa6a3da5b1f3c895c1e7c2a94 100644 --- a/firefox-91.4.0esr.processed-source.tar.xz +++ b/firefox-91.5.0esr.processed-source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb90f65449dd00903292093f95f3bcd51b5b767cd4816605f66c4c090fd9b5ec -size 388025128 +oid sha256:0044d33f372fffce54a35aeec2a9220408cc4075f50fde3223771c3fe3f58010 +size 387299488 diff --git a/firefox-anolis-default-prefs.js b/firefox-centos-default-prefs.js similarity index 92% rename from firefox-anolis-default-prefs.js rename to firefox-centos-default-prefs.js index 0cc561fce5cfc81073ed4f4386f8de5d70abd0c6..039e27f3bc94836873ade6193fcaf28f8fef85f5 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-centos-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://openanolis.cn/"); -pref("startup.homepage_welcome_url", "https://openanolis.cn/"); +pref("startup.homepage_override_url", "http://www.centos.org"); +pref("startup.homepage_welcome_url", "http://www.centos.org"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); diff --git a/firefox-langpacks-91.4.0esr-20211201.tar.xz b/firefox-langpacks-91.5.0esr-20220106.tar.xz similarity index 77% rename from firefox-langpacks-91.4.0esr-20211201.tar.xz rename to firefox-langpacks-91.5.0esr-20220106.tar.xz index 2a5b2d35bf23b888c48311faa79ebbc3a0e4f28d..1475e74ddfc271a0c52b0137574a647927cb963c 100644 Binary files a/firefox-langpacks-91.4.0esr-20211201.tar.xz and b/firefox-langpacks-91.5.0esr-20220106.tar.xz differ diff --git a/firefox.spec b/firefox.spec index 459cef0faa07b6c998853b3cc9cfd735f3d0ba29..0238290981780f9fd6a4aed56c37de1d9ad3ddd9 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -129,18 +128,22 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.4.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.5.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + %if %{rhel_minor_version} == 1 +ExcludeArch: %{ix86} aarch64 s390x + %else ExcludeArch: %{ix86} + %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -150,12 +153,16 @@ ExcludeArch: s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220106.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +%if 0%{?centos} +Source12: firefox-centos-default-prefs.js +%else +Source12: firefox-redhat-default-prefs.js +%endif Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -321,7 +328,7 @@ Requires: nss >= %{nss_build_version} BuildRequires: desktop-file-utils BuildRequires: system-bookmarks -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -977,7 +984,7 @@ function install_rpms_to_current_dir() { %endif # set up our default bookmarks -#%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html +%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1257,10 +1264,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Jan 10 2022 yangxianzhao - 91.4.0-1.0.1 -- Rebrand for Anolis -- Remove bookmarks -- Cherry-pick [2a01325] +* Thu Jan 06 2022 Eike Rathke - 91.5.0-1 +- Update to 91.5.0 build1 * Wed Dec 01 2021 Eike Rathke - 91.4.0-1 - Update to 91.4.0 build1