From 01eef791bb39c776758b6ea94e89095cc7805914 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Fri, 8 Sep 2023 10:21:25 +0800 Subject: [PATCH 1/2] update to firefox-102.15.0-1 Signed-off-by: Zhao Hang --- download | 4 +- ...refs.js => firefox-redhat-default-prefs.js | 7 ++- firefox.spec | 44 ++++++++++--------- 3 files changed, 28 insertions(+), 27 deletions(-) rename firefox-anolis-default-prefs.js => firefox-redhat-default-prefs.js (86%) diff --git a/download b/download index e0f5380..ad019a0 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ -4e9f2a31a2c6d842f87b823cad5e58ea firefox-102.14.0esr.processed-source.tar.xz -53d2a66ed937378faa8142715ae67512 firefox-langpacks-102.14.0esr-20230725.tar.xz d60fdae0a720baa240534de94d88c8e2 cbindgen-vendor.tar.xz +4af123ed7dbad2c8e1f33e8732159ba8 firefox-102.15.0esr.processed-source.tar.xz +c8f1212b0519424712e857cd2d04ca15 firefox-langpacks-102.15.0esr-20230824.tar.xz d41d8cd98f00b204e9800998ecf8427e mochitest-python.tar.gz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm b603172c3f4cbb1d8197328087ca3972 nss-3.79.0-11.el8_1.src.rpm diff --git a/firefox-anolis-default-prefs.js b/firefox-redhat-default-prefs.js similarity index 86% rename from firefox-anolis-default-prefs.js rename to firefox-redhat-default-prefs.js index 047e9e1..e1013e5 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", "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("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 74306b9..61a999b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,3 @@ -%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. @@ -17,17 +16,17 @@ %{lua: function dist_to_rhel8_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 8 + return 9 end return -1 end} @@ -219,8 +218,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.14.0 -Release: 1%{anolis_release}%{?dist} +Version: 102.15.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -230,8 +229,6 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # When unset use processed source file name as is. #%%global buildnum .b2 -ExcludeArch: loongarch64 - %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif @@ -252,12 +249,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}-20230725.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20230824.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 @@ -458,12 +455,12 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +Requires: redhat-indexhtml -#%if !0%{?flatpak} +%if !0%{?flatpak} #TODO -#BuildRequires: system-bookmarks -#%endif +BuildRequires: system-bookmarks +%endif %if %{?system_ffi} BuildRequires: pkgconfig(libffi) %endif @@ -1175,9 +1172,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 @@ -1476,9 +1473,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Aug 04 2023 Liwei Ge - 102.14.0-1.0.1 -- Add firefox-anolis-default-prefs.js -- Remove bookmarks and loongarch64 +* Thu Aug 24 2023 Eike Rathke - 102.15.0-1 +- Update to 102.15.0 build2 + +* Wed Aug 09 2023 Eike Rathke - 102.14.0-3 +- Bump NVR to rebuild + +* Wed Aug 09 2023 Jan Horak - 102.14.0-2 +- Rebuild due to rhbz#2228948 * Tue Jul 25 2023 Eike Rathke - 102.14.0-1 - Update to 102.14.0 build1 -- Gitee From 21acc67bc24aba8dc29b1f800580bc3f665a384f 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 (86%) diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 86% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index e1013e5..047e9e1 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.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); pref("media.gmp.decoder.enabled", true); diff --git a/firefox.spec b/firefox.spec index 61a999b..68a3815 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,17 +17,17 @@ %{lua: function dist_to_rhel8_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 9 + return 8 end return -1 end} @@ -219,7 +220,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 102.15.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -229,6 +230,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # When unset use processed source file name as is. #%%global buildnum .b2 +ExcludeArch: loongarch64 + %if 0%{?rhel} == 9 ExcludeArch: %{ix86} %endif @@ -254,7 +257,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20230824.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 @@ -455,12 +458,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 @@ -1172,9 +1175,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 @@ -1473,6 +1476,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Sep 08 2023 Liwei Ge - 102.15.0-1.0.1 +- Add firefox-anolis-default-prefs.js +- Remove bookmarks and loongarch64 + * Thu Aug 24 2023 Eike Rathke - 102.15.0-1 - Update to 102.15.0 build2 -- Gitee