From 518e9d59d1a6850b12e20f777400961ffba278d4 Mon Sep 17 00:00:00 2001 From: Renbo Date: Tue, 27 Feb 2024 11:24:54 +0800 Subject: [PATCH 1/2] update to thunderbird-115.8.0-1.src.rpm Signed-off-by: Renbo --- build-rhel7-lower-node-min-version.patch | 12 +++++----- download | 4 ++-- ...an8 => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 23 ++++++++----------- 4 files changed, 19 insertions(+), 22 deletions(-) rename thunderbird-anolis-default-prefs.js.an8 => thunderbird-redhat-default-prefs.js (96%) diff --git a/build-rhel7-lower-node-min-version.patch b/build-rhel7-lower-node-min-version.patch index 2bb39c8..398cbc3 100644 --- a/build-rhel7-lower-node-min-version.patch +++ b/build-rhel7-lower-node-min-version.patch @@ -1,11 +1,11 @@ ---- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200 -+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200 +--- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2024-02-12 21:53:56.000000000 +0200 ++++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py 2024-02-14 16:48:12.476182627 +0200 @@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir - from mozfile import which + from packaging.version import Version from six import PY3 --NODE_MIN_VERSION = StrictVersion("12.22.12") -+NODE_MIN_VERSION = StrictVersion("10.24.0") - NPM_MIN_VERSION = StrictVersion("6.14.16") +-NODE_MIN_VERSION = Version("12.22.12") ++NODE_MIN_VERSION = Version("10.24.0") + NPM_MIN_VERSION = Version("6.14.16") diff --git a/download b/download index f0f21f3..ebb1c37 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ 9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -5435c28c9fdb4f05b93ca44ecfc17445 thunderbird-115.7.0.processed-source.tar.xz -cb49a9b442f0abf013fa623cf4e133c0 thunderbird-langpacks-115.7.0-20240122.tar.xz +38fb281ac55e8e78207cd434e1c3aa12 thunderbird-115.8.0.processed-source.tar.xz +3eebf3a9f1a357ace6d347a9e8c8c7a2 thunderbird-langpacks-115.8.0-20240219.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm d9c9dd9619daeb43820de97b04bede45 nss-3.90.0-2.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm diff --git a/thunderbird-anolis-default-prefs.js.an8 b/thunderbird-redhat-default-prefs.js similarity index 96% rename from thunderbird-anolis-default-prefs.js.an8 rename to thunderbird-redhat-default-prefs.js index a3f8698..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js.an8 +++ b/thunderbird-redhat-default-prefs.js @@ -2,7 +2,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); /* Allow users to set custom colors*/ /* pref("browser.display.use_system_colors", true);*/ -pref("general.useragent.vendor", "Anolis OS"); +pref("general.useragent.vendor", "Red Hat"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); diff --git a/thunderbird.spec b/thunderbird.spec index 203c1cc..68b1977 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Set for local builds only %global disable_toolsets 0 @@ -14,17 +13,17 @@ %{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 8 + return 10 end match = string.match(str, ".module%+el9.%d+") if match then @@ -135,8 +134,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.7.0 -Release: 1%{anolis_release}%{?dist} +Version: 115.8.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -158,7 +157,6 @@ ExcludeArch: %{ix86} %if 0%{?rhel} == 7 ExcludeArch: aarch64 s390 ppc ppc64 %endif -ExcludeArch: loongarch64 # We can't use the official tarball as it contains some test files that use # licenses that are rejected by Red Hat Legal. @@ -167,12 +165,12 @@ ExcludeArch: loongarch64 #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: thunderbird-langpacks-%{version}-20240122.tar.xz +Source1: thunderbird-langpacks-%{version}-20240219.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-anolis-default-prefs.js.an8 +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -1516,9 +1514,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Jan 31 2024 Liwei Ge - 115.7.0-1.0.1 -- Rebrand to Anolis -- Remove loongarch64 arch(Zhao Hang) +* Mon Feb 19 2024 Eike Rathke - 115.8.0-1 +- Update to 115.8.0 build1 * Mon Jan 22 2024 Eike Rathke - 115.7.0-1 - Update to 115.7.0 build1 -- Gitee From 5308eeff2e068b7d00bd1135fbbb4dc918ed5bf5 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 20 Dec 2021 03:27:54 +0000 Subject: [PATCH 2/2] rebrand: rename js file and update vendor --- ... => thunderbird-anolis-default-prefs.js.an8 | 2 +- thunderbird.spec | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) rename thunderbird-redhat-default-prefs.js => thunderbird-anolis-default-prefs.js.an8 (96%) diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-anolis-default-prefs.js.an8 similarity index 96% rename from thunderbird-redhat-default-prefs.js rename to thunderbird-anolis-default-prefs.js.an8 index 4d01b78..a3f8698 100644 --- a/thunderbird-redhat-default-prefs.js +++ b/thunderbird-anolis-default-prefs.js.an8 @@ -2,7 +2,7 @@ pref("app.update.enabled", false); pref("app.update.autoInstallEnabled", false); /* Allow users to set custom colors*/ /* pref("browser.display.use_system_colors", true);*/ -pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendor", "Anolis OS"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); diff --git a/thunderbird.spec b/thunderbird.spec index 68b1977..4981ea2 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Set for local builds only %global disable_toolsets 0 @@ -13,17 +14,17 @@ %{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 + return 8 end match = string.match(str, ".module%+el9.%d+") if match then @@ -135,7 +136,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 115.8.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -157,6 +158,7 @@ ExcludeArch: %{ix86} %if 0%{?rhel} == 7 ExcludeArch: aarch64 s390 ppc ppc64 %endif +ExcludeArch: loongarch64 # We can't use the official tarball as it contains some test files that use # licenses that are rejected by Red Hat Legal. @@ -170,7 +172,7 @@ Source1: thunderbird-langpacks-%{version}-20240219.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-redhat-default-prefs.js +Source12: thunderbird-anolis-default-prefs.js.an8 Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -1514,6 +1516,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Feb 27 2024 Liwei Ge - 115.8.0-1.0.1 +- Rebrand to Anolis +- Remove loongarch64 arch(Zhao Hang) + * Mon Feb 19 2024 Eike Rathke - 115.8.0-1 - Update to 115.8.0 build1 -- Gitee