From ca44e3bc71461fb3d50e38568865ad1a9a8ec83a Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 14 Oct 2024 14:02:29 +0800 Subject: [PATCH 1/2] update to thunderbird-128.3.1-1.src.rpm Signed-off-by: Zhao Hang --- download | 4 ++-- ...an8 => thunderbird-redhat-default-prefs.js | 8 +++---- thunderbird.spec | 24 ++++++++----------- 3 files changed, 16 insertions(+), 20 deletions(-) rename thunderbird-anolis-default-prefs.js.an8 => thunderbird-redhat-default-prefs.js (87%) diff --git a/download b/download index 0538456..bde7e59 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz -a2c94f4ba3c7e462812e1a1152b33621 thunderbird-128.3.0esr.processed-source.tar.xz -b17e4691d697256f9b6e082164bb4050 thunderbird-langpacks-128.3.0esr-20240930.tar.xz +d2f6736b75543ecc560246ee7e0b7574 thunderbird-128.3.1esr.processed-source.tar.xz +88defd9466595c5f75c450a78bc5cbde thunderbird-langpacks-128.3.1esr-20241009.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm ab085bce989de91681f48fdd05be4c0f nss-3.101.0-7.el8_2.src.rpm dbf6357877e3e1042de1a95cdfb61507 nss-3.101.0-7.el9_2.src.rpm diff --git a/thunderbird-anolis-default-prefs.js.an8 b/thunderbird-redhat-default-prefs.js similarity index 87% rename from thunderbird-anolis-default-prefs.js.an8 rename to thunderbird-redhat-default-prefs.js index e54f49c..15faa7b 100644 --- a/thunderbird-anolis-default-prefs.js.an8 +++ b/thunderbird-redhat-default-prefs.js @@ -1,15 +1,15 @@ 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"); +/* Allow users to set custom colors*/ +/* pref("browser.display.use_system_colors", true);*/ +pref("general.useragent.vendor", "Red Hat"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); pref("toolkit.networkmanager.disable", false); pref("offline.autoDetect", true); -/* Disable global indexing by default */ +/* Disable global indexing by default*/ pref("mailnews.database.global.indexer.enabled", false); /* Do not switch to Smart Folders after upgrade to 3.0b4 */ diff --git a/thunderbird.spec b/thunderbird.spec index eda12fe..79d4010 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 @@ -132,8 +131,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.3.0 -Release: 1%{anolis_release}%{?dist} +Version: 128.3.1 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -152,7 +151,6 @@ ExcludeArch: %{ix86} %endif %endif %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. @@ -161,12 +159,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}%{?pre_version}-20240930.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20241009.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 @@ -323,7 +321,6 @@ BuildRequires: zlib-devel BuildRequires: gcc-toolset-13-runtime BuildRequires: gcc-toolset-13-binutils BuildRequires: gcc-toolset-13-gcc -BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: gcc-toolset-13-gcc-plugin-annobin %endif @@ -1637,9 +1634,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Oct 08 2024 Liwei Ge - 128.3.0-1.0.1 -- Rebrand to Anolis -- Remove loongarch64 arch(Zhao Hang) +* Wed Oct 09 2024 Eike Rathke - 128.3.1-1 +- Update to 128.3.1 * Mon Sep 30 2024 Jan Horak - 128.3.0-1 - Update to 127.3.0 -- Gitee From 02dc94bf0aad2eef6c76fd486ef3a1ff7787a49c 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 | 8 ++++---- thunderbird.spec | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) rename thunderbird-redhat-default-prefs.js => thunderbird-anolis-default-prefs.js.an8 (87%) diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-anolis-default-prefs.js.an8 similarity index 87% rename from thunderbird-redhat-default-prefs.js rename to thunderbird-anolis-default-prefs.js.an8 index 15faa7b..e54f49c 100644 --- a/thunderbird-redhat-default-prefs.js +++ b/thunderbird-anolis-default-prefs.js.an8 @@ -1,15 +1,15 @@ 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"); +/* Allow users to set custom colors */ +/* pref("browser.display.use_system_colors", true); */ +pref("general.useragent.vendor", "Anolis OS"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); pref("intl.locale.matchOS", true); pref("mail.shell.checkDefaultClient", false); pref("toolkit.networkmanager.disable", false); pref("offline.autoDetect", true); -/* Disable global indexing by default*/ +/* Disable global indexing by default */ pref("mailnews.database.global.indexer.enabled", false); /* Do not switch to Smart Folders after upgrade to 3.0b4 */ diff --git a/thunderbird.spec b/thunderbird.spec index 79d4010..6b2d848 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 @@ -132,7 +133,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.3.1 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -151,6 +152,7 @@ ExcludeArch: %{ix86} %endif %endif %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. @@ -164,7 +166,7 @@ Source1: thunderbird-langpacks-%{version}%{?pre_version}-20241009.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 @@ -321,6 +323,7 @@ BuildRequires: zlib-devel BuildRequires: gcc-toolset-13-runtime BuildRequires: gcc-toolset-13-binutils BuildRequires: gcc-toolset-13-gcc +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: gcc-toolset-13-gcc-plugin-annobin %endif @@ -1634,6 +1637,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Oct 14 2024 Liwei Ge - 128.3.1-1.0.1 +- Rebrand to Anolis +- Remove loongarch64 arch(Zhao Hang) + * Wed Oct 09 2024 Eike Rathke - 128.3.1-1 - Update to 128.3.1 -- Gitee