From 24c0b20537063480011d1c378e80d55703b4d0fb Mon Sep 17 00:00:00 2001 From: Renbo Date: Tue, 27 Feb 2024 11:05:32 +0800 Subject: [PATCH 1/2] update to firefox-115.8.0-1.src.rpm Signed-off-by: Renbo --- download | 4 +- ...refs.js => firefox-redhat-default-prefs.js | 7 ++-- firefox.spec | 38 +++++++++---------- 3 files changed, 22 insertions(+), 27 deletions(-) rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (85%) diff --git a/download b/download index fccb59e..08d4b5c 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ 9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -95dbe23f330c3e210f78157f1c257ba4 firefox-115.7.0esr.processed-source.tar.xz -52e45aed2318f35250637366955452ee firefox-langpacks-115.7.0esr-20240116.tar.xz +4547c70735d92b180968c0d659170610 firefox-115.8.0esr.processed-source.tar.xz +3a2850ddc70a26348c7fc56a2a563006 firefox-langpacks-115.8.0esr-20240213.tar.xz b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm 3fdd30cefe44a98c424cb3aeca73f2b3 nss-3.90.0-3.el8_1.src.rpm diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 85% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index c301dbf..cdb98dd 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -14,10 +14,9 @@ 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("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("startup.homepage_override_url", "%HOMEPAGE%"); +pref("startup.homepage_welcome_url", "%HOMEPAGE%"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("media.gmp-gmpopenh264.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); pref("media.gmp.decoder.enabled", true); diff --git a/firefox.spec b/firefox.spec index 2811b4a..e814b7b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -15,15 +14,15 @@ %{lua: function dist_to_rhel_minor(str, start) - match = string.match(str, ".module%+an8.%d+") + match = string.match(str, ".module%+el8.%d+") if match then return string.sub(match, 13) end - match = string.match(str, ".an8_%d+") + match = string.match(str, ".el8_%d+") if match then return string.sub(match, 6) end - match = string.match(str, ".an8") + match = string.match(str, ".el8") if match then return 10 end @@ -133,13 +132,11 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.7.0 -Release: 1%{anolis_release}%{?dist} +Version: 115.8.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ -ExcludeArch: loongarch64 - %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif @@ -166,12 +163,12 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20240116.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20240213.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-anolis-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -351,10 +348,10 @@ BuildRequires: xmlto BuildRequires: zlib-devel %endif -#%if !0%{?flatpak} +%if !0%{?flatpak} #TODO -#BuildRequires: system-bookmarks -#%endif +BuildRequires: system-bookmarks +%endif %if 0%{?test_on_wayland} BuildRequires: dbus-x11 @@ -413,7 +410,7 @@ BuildRequires: gcc-toolset-12-gcc-plugin-annobin Requires: mozilla-filesystem Requires: p11-kit-trust Requires: pciutils-libs -Requires: anolis-indexhtml +Requires: redhat-indexhtml %if %{?system_nss} && !0%{?bundle_nss} Requires: nspr >= %{nspr_version} @@ -1452,10 +1449,10 @@ EOF %endif # set up our default bookmarks -#%if !0%{?flatpak} - #%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html - #%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html -#%endif +%if !0%{?flatpak} + %global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html + %{__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 @@ -1743,9 +1740,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Jan 31 2024 Liwei Ge - 115.7.0-1.0.1 -- Add firefox-anolis-default-prefs.js -- Remove bookmarks and loongarch64 +* Tue Feb 13 2024 Eike Rathke - 115.8.0-1 +- Update to 115.8.0 build1 * Tue Jan 16 2024 Eike Rathke - 115.7.0-1 - Update to 115.7.0 build1 -- Gitee From 6a04f11c8c4a370894e61b189f000fe1e40c5ae2 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 16 Dec 2021 06:12:47 +0000 Subject: [PATCH 2/2] rebrand: add firefox-anolis-default-prefs.js --- ...refs.js => firefox-anolis-default-prefs.js | 7 ++-- firefox.spec | 33 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (85%) diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 85% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index cdb98dd..c301dbf 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", "%HOMEPAGE%"); -pref("startup.homepage_welcome_url", "%HOMEPAGE%"); -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.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); pref("media.gmp.decoder.enabled", true); diff --git a/firefox.spec b/firefox.spec index e814b7b..3ec681f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -14,15 +15,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 10 end @@ -133,10 +134,12 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 115.8.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ +ExcludeArch: loongarch64 + %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif @@ -168,7 +171,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20240213.tar.x 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 @@ -348,10 +351,10 @@ BuildRequires: xmlto BuildRequires: zlib-devel %endif -%if !0%{?flatpak} +#%if !0%{?flatpak} #TODO -BuildRequires: system-bookmarks -%endif +#BuildRequires: system-bookmarks +#%endif %if 0%{?test_on_wayland} BuildRequires: dbus-x11 @@ -410,7 +413,7 @@ BuildRequires: gcc-toolset-12-gcc-plugin-annobin Requires: mozilla-filesystem Requires: p11-kit-trust Requires: pciutils-libs -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?system_nss} && !0%{?bundle_nss} Requires: nspr >= %{nspr_version} @@ -1449,10 +1452,10 @@ EOF %endif # set up our default bookmarks -%if !0%{?flatpak} - %global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html - %{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html -%endif +#%if !0%{?flatpak} + #%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html + #%{__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 @@ -1740,6 +1743,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Feb 27 2024 Liwei Ge - 115.8.0-1.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks and loongarch64 + * Tue Feb 13 2024 Eike Rathke - 115.8.0-1 - Update to 115.8.0 build1 -- Gitee