From 7aca063549149b0aa4b86d47aaa0f6f797f2de4f Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 25 Aug 2022 06:08:05 +0800 Subject: [PATCH 1/2] update to firefox-91.13.0-1.el7_9 Signed-off-by: anolis-bot --- dist | 1 + download | 4 ++-- ...refs.js => firefox-redhat-default-prefs.js | 6 +++--- firefox.spec | 21 +++++++++++-------- 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 dist rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (90%) diff --git a/dist b/dist new file mode 100644 index 0000000..ad8eb77 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7_9 diff --git a/download b/download index add68ce..e512258 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -b973ea73ee45599205924c717958e9c3 firefox-91.12.0esr.processed-source.tar.xz -9c20224f75cd385a3a41eb6262a226e3 firefox-langpacks-91.12.0esr-20220721.tar.xz +0be0cf60f9b52364ae564f6c7dee9016 firefox-91.13.0esr.processed-source.tar.xz +442ae7715acdf6c640e3fce1a4796e05 firefox-langpacks-91.13.0esr-20220817.tar.xz 5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm 770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 90% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 0cc561f..9ead3a2 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); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/firefox.spec b/firefox.spec index 31c8ce4..9db388f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -136,8 +135,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.12.0 -Release: 2%{anolis_release}%{?dist} +Version: 91.13.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -151,7 +150,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 @@ -161,13 +160,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}%{?buildnum}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220721.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220817.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 @@ -331,7 +334,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 @@ -1268,8 +1271,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Aug 10 2022 Liwei Ge - 91.12.0-1.0.1 -- Rebrand to Anolis +* Wed Aug 17 2022 Eike Rathke - 91.13.0-1 +- Update to 91.13.0 build1 * Thu Jul 21 2022 Eike Rathke - 91.12.0-1 - Update to 91.12.0 build1 -- Gitee From e307babed918c6e93dd4b57745449447dfaae22d Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Wed, 10 Aug 2022 11:06:47 +0800 Subject: [PATCH 2/2] rebrand for anolis Signed-off-by: yangxianzhao --- ...-prefs.js => firefox-anolis-default-prefs.js | 6 +++--- firefox.spec | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (90%) diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 90% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 9ead3a2..0cc561f 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-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", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("startup.homepage_override_url", "https://openanolis.cn/"); +pref("startup.homepage_welcome_url", "https://openanolis.cn/"); 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); @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file +pref("storage.nfs_filesystem", true); diff --git a/firefox.spec b/firefox.spec index 9db388f..c0254ec 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -136,7 +137,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 91.13.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -150,7 +151,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -166,11 +167,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220817.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -%if 0%{?centos} -Source12: firefox-centos-default-prefs.js -%else -Source12: firefox-redhat-default-prefs.js -%endif +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -334,7 +331,7 @@ Requires: nss >= %{nss_build_version} BuildRequires: desktop-file-utils BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -1271,6 +1268,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Aug 25 2022 Liwei Ge - 91.13.0-1.0.1 +- Rebrand to Anolis +- Cherry-pick [e480bbe] + * Wed Aug 17 2022 Eike Rathke - 91.13.0-1 - Update to 91.13.0 build1 -- Gitee