From ae53c80faa7a45123a17942832f0d465730f95c0 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Wed, 26 Oct 2022 09:57:30 +0800 Subject: [PATCH 1/2] update to thunderbird-102.4.0-1.el8_6 Signed-off-by: anolis-bot --- build-rhel7-lower-node-min-version.patch | 11 +++++++++ download | 4 ++-- ...an7 => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 23 +++++++++++-------- 4 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 build-rhel7-lower-node-min-version.patch rename thunderbird-anolis-default-prefs.js.an7 => thunderbird-redhat-default-prefs.js (96%) diff --git a/build-rhel7-lower-node-min-version.patch b/build-rhel7-lower-node-min-version.patch new file mode 100644 index 0000000..3dce244 --- /dev/null +++ b/build-rhel7-lower-node-min-version.patch @@ -0,0 +1,11 @@ +--- thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py.build-rhel7-lower-node-min-version 2022-10-14 21:42:10.000000000 +0200 ++++ thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 18:49:44.490667820 +0200 +@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir + from mozfile import which + from six import PY3 + +-NODE_MIN_VERSION = StrictVersion("10.24.1") ++NODE_MIN_VERSION = StrictVersion("10.24.0") + NPM_MIN_VERSION = StrictVersion("6.14.12") + + diff --git a/download b/download index 403cceb..1640a72 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ a9f32342fcac2b79f76860ee742d6ff1 cbindgen-vendor.tar.xz -0e68157d26a74ca5e8852c94adb8ee29 thunderbird-102.3.0.processed-source.tar.xz -60a6a764b4a1feaa4cd6f89f8d165166 thunderbird-langpacks-102.3.0-20220916.tar.xz +36c28b3c35b93cf8254e6bd4673f7a86 thunderbird-102.4.0.processed-source.tar.xz +5e7702d2791de7c844ae8a7d255a7b30 thunderbird-langpacks-102.4.0-20221017.tar.xz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm 04f69b8baa7bd8ddc49d786b04307df8 nss-3.79.0-6.el8_1.src.rpm diff --git a/thunderbird-anolis-default-prefs.js.an7 b/thunderbird-redhat-default-prefs.js similarity index 96% rename from thunderbird-anolis-default-prefs.js.an7 rename to thunderbird-redhat-default-prefs.js index a3f8698..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js.an7 +++ 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 9f0dac5..f3361a7 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 @@ -10,15 +9,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 7 end @@ -159,8 +158,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.3.0 -Release: 4%{anolis_release}%{?dist} +Version: 102.4.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -181,12 +180,12 @@ ExcludeArch: aarch64 s390 ppc #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}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20220916.tar.xz +Source1: thunderbird-langpacks-%{version}-20221017.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: thunderbird-mozconfig -Source12: thunderbird-anolis-default-prefs.js.an7 +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -215,6 +214,7 @@ Patch73: build-ascii-decode-fail-rhel7.patch Patch75: build-big-endian-errors.patch Patch76: firefox-nss-version.patch Patch77: mozilla-1775202.patch +Patch78: build-rhel7-lower-node-min-version.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -577,6 +577,9 @@ echo "use_rustts %{?use_rustts}" %patch77 -p1 -b .mozilla-1775202 %patch73 -p1 -b .build-ascii-decode-fail-rhel7 +%if 0%{?rhel} == 7 +%patch78 -p1 -b .build-rhel7-lower-node-min-version +%endif # Test patches @@ -1225,8 +1228,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Oct 19 2022 Liwei Ge - 102.3.0-4.0.1 -- Rebrand to Anolis +* Mon Oct 17 2022 Eike Rathke - 102.4.0-1 +- Update to 102.4.0 build1 * Wed Oct 12 2022 Jan Horak - 102.3.0-4 - Fix for expat CVE-2022-40674 -- Gitee From baac5d5c37f456060bd2b9185a77692c17870805 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 --- ...s.js => thunderbird-anolis-default-prefs.js.an7 | 2 +- thunderbird.spec | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) rename thunderbird-redhat-default-prefs.js => thunderbird-anolis-default-prefs.js.an7 (96%) diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-anolis-default-prefs.js.an7 similarity index 96% rename from thunderbird-redhat-default-prefs.js rename to thunderbird-anolis-default-prefs.js.an7 index 4d01b78..a3f8698 100644 --- a/thunderbird-redhat-default-prefs.js +++ b/thunderbird-anolis-default-prefs.js.an7 @@ -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 f3361a7..b037d49 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 @@ -9,15 +10,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 @@ -159,7 +160,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 102.4.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -185,7 +186,7 @@ Source1: thunderbird-langpacks-%{version}-20221017.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.an7 Source20: thunderbird.desktop Source21: thunderbird.sh.in Source24: mozilla-api-key @@ -1228,6 +1229,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Oct 26 2022 Liwei Ge - 102.4.0-1.0.1 +- Rebrand to Anolis + * Mon Oct 17 2022 Eike Rathke - 102.4.0-1 - Update to 102.4.0 build1 -- Gitee