diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 84% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index 7bf5098784281d95f8a8de37815183c62a05a5e1..c0e8ebfdd21064b3b877ea9bdd678d44944bf53e 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-default-prefs.js @@ -14,9 +14,10 @@ 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("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:///usr/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); @@ -36,4 +37,4 @@ pref("browser.gnome-search-provider.enabled",true); /* Enable ffvpx playback for WebRTC */ pref("media.navigator.mediadatadecoder_vpx_enabled", true); /* 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 2fa485ed67ff60f1872abae109f60c69987fdf7b..ddabf365cf705c029df24f79336b7581fec45179 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global disable_toolsets 0 # Produce a build suitable for release, i.e. use PGO/LTO. You can turn it off # when building locally to reduce build time. @@ -16,15 +17,15 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+el8.%d+") + match = string.match(str, ".module%+an8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".el8_%d+") + match = string.match(str, ".an8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".el8") + match = string.match(str, ".an8") if match then return 7 end @@ -201,7 +202,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.3.0 -Release: 6%{?dist} +Release: 6%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -230,7 +231,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20220913.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-redhat-default-prefs.js +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -425,12 +426,12 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: redhat-indexhtml +Requires: anolis-indexhtml -%if !0%{?flatpak} +#%if !0%{?flatpak} #TODO -BuildRequires: system-bookmarks -%endif +#BuildRequires: system-bookmarks +#%endif %if %{?system_ffi} BuildRequires: pkgconfig(libffi) %endif @@ -1106,9 +1107,9 @@ mkdir -p test_results %endif # set up our default bookmarks -%if !0%{?flatpak} -%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html -%endif +# %if !0%{?flatpak} +# %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html +# %endif # Make sure locale works for langpacks %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF @@ -1401,9 +1402,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Sep 27 2022 Liwei Ge - 102.3.0-6.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks + * Tue Sep 13 2022 Jan Horak - 102.3.0-6 - Update to 102.3.0 build1 +* 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