diff --git a/download b/download index 0e7309affc47ab2dfa8c883bee016f41a50fc17e..95c10bd369bf94fda2f664e8dc3bf5b61d02c9a8 100644 --- a/download +++ b/download @@ -1 +1 @@ -c9f2564d7ee920f269434494b24ea440 firefox-91.8.0esr.processed-source.tar.xz +38e4a8d4dc51e0250cb2afef8caf0aea firefox-91.9.0esr.processed-source.tar.xz diff --git a/firefox-langpacks-91.8.0esr-20220405.tar.xz b/firefox-langpacks-91.9.0esr-20220426.tar.xz similarity index 77% rename from firefox-langpacks-91.8.0esr-20220405.tar.xz rename to firefox-langpacks-91.9.0esr-20220426.tar.xz index 461da3374187422269acf5cb4e0b7fac271810dc..dff0c2fc864584d7a9286f9b947bf51cab390960 100644 Binary files a/firefox-langpacks-91.8.0esr-20220405.tar.xz and b/firefox-langpacks-91.9.0esr-20220426.tar.xz differ diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 83% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 40110248cfb0cc0ac9a41343b06885b5867a4db4..9ead3a2085db1bcf5515db5f25c4db81fc6ba7a6 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-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.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); 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); @@ -23,7 +23,7 @@ pref("media.gmp-gmpopenh264.autoupdate",false); pref("media.gmp-gmpopenh264.enabled",false); pref("media.gmp-gmpopenh264.enabled",false); pref("plugins.notifyMissingFlash", false); -/* See https://bugzilla.centos.org/show_bug.cgi?id=1226489 */ +/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */ pref("browser.display.use_system_colors", false); pref("layers.use-image-offscreen-surfaces", false); /* Allow sending credetials to all https:// sites */ @@ -31,5 +31,5 @@ pref("network.negotiate-auth.trusted-uris", "https://"); pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); -/* See https://bugzilla.centos.org/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/firefox.spec b/firefox.spec index ff1baf6ff1f8542774d5eb0737cbbd148eb5e256..45c216ba306093d372f595ee464b56b1d4d4d935 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -19,7 +18,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el8") if match then - return 6 + return 7 end return -1 end} @@ -129,8 +128,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.8.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.9.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -144,7 +143,7 @@ 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 @@ -154,13 +153,17 @@ 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}-20220405.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220426.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 @@ -324,7 +327,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 @@ -432,7 +435,7 @@ echo "use_rustts %{?use_rustts}" %patch224 -p1 -b .1170092 # the nss changed in 8.6 and later, so addons are working in older releases -%if 0%{?rhel_minor_version} >= 6 +%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 6) || 0%{?rhel} >= 9 %patch225 -p1 -b .firefox-nss-addon-hack %endif @@ -1261,9 +1264,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Sat Apr 09 2022 maqi - 91.8.0-1.01 -- Rebrand for Anolis -- cherry pick 68d9caeec18664e71421c45405ebe394c628700c +* Tue Apr 26 2022 Eike Rathke - 91.9.0-1 +- Update to 91.9.0 * Tue Apr 05 2022 Eike Rathke - 91.8.0-1 - Update to 91.8.0