From ab029b37131377a00ba7166ba78fe31a44b9ba87 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Mon, 22 Feb 2021 16:37:36 +0800 Subject: [PATCH] rebrand: add firefox-anolis-default-prefs.js - add firefox-anolis-default-prefs.js - remove bookmarks Signed-off-by: Liwei Ge Signed-off-by: zhangbinchen (cherry picked from commit a7220d7e4a359727b7a85f1541aa32114e539720) Signed-off-by: zhangbinchen (cherry picked from commit bdaeecfcd0d275629724717cbf2abded5cf61dcb) Signed-off-by: zhangbinchen --- firefox-redhat-default-prefs.js | 35 --------------------------------- firefox.spec | 20 ++++++++++--------- 2 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 firefox-redhat-default-prefs.js diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js deleted file mode 100644 index 9ead3a2..0000000 --- a/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,35 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("general.smoothScroll", true); -pref("intl.locale.matchOS", true); -pref("toolkit.storage.synchronous", 0); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -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("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); -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.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 */ -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.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 1087840..d41c298 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global disable_toolsets 0 %ifarch %{ix86} @@ -129,7 +130,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 91.4.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 @@ -154,11 +155,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.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 @@ -317,8 +314,8 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml + %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -967,7 +964,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 @@ -1247,6 +1244,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Dec 15 2021 Liwei Ge - 91.4.0-1.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks +- cherry-pick [bdaeecf] + * Wed Dec 01 2021 Eike Rathke - 91.4.0-1 - Update to 91.4.0 build1 -- Gitee