From b37c5e772fdd309ba8ca8febc4c71750bd5cbc03 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 18 May 2023 15:04:13 +0800 Subject: [PATCH 1/2] update to thunderbird-102.11.0-1.el8_7 Signed-off-by: anolis-bot --- download | 4 +-- ...an7 => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 25 ++++++++----------- 3 files changed, 14 insertions(+), 17 deletions(-) rename thunderbird-anolis-default-prefs.js.an7 => thunderbird-redhat-default-prefs.js (96%) diff --git a/download b/download index aa0c112..5cd523b 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ a9f32342fcac2b79f76860ee742d6ff1 cbindgen-vendor.tar.xz -e7991f43d99938d9ac6cad51cd91bd3b thunderbird-102.10.0.b2.processed-source.tar.xz -9c9eb7523570e30dee52e7f2f5b8a237 thunderbird-langpacks-102.10.0-20230411.tar.xz +38d1ee4c7e882e54b8864e34df311d7e thunderbird-102.11.0.processed-source.tar.xz +f48229b98fd91da6ab088a16b5b2601d thunderbird-langpacks-102.11.0-20230504.tar.xz 75157f5e77e1a4f460645a57ff54e552 nspr-4.34.0-3.el8_1.src.rpm b603172c3f4cbb1d8197328087ca3972 nss-3.79.0-11.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 e9e3abf..97728a7 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,17 +9,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 7 + return 9 end return -1 end} @@ -166,8 +165,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.10.0 -Release: 2%{anolis_release}%{?dist} +Version: 102.11.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -175,7 +174,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # thunderbird-102.8.0.b2.processed-source.tar.xz # When unset use processed source file name as is. -%global buildnum .b2 +#%%global buildnum .b2 %if 0%{?rhel} == 9 ExcludeArch: %{ix86} @@ -190,17 +189,16 @@ ExcludeArch: %{ix86} %if 0%{?rhel} == 7 ExcludeArch: aarch64 s390 ppc %endif -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 %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20230411.tar.xz +Source1: thunderbird-langpacks-%{version}-20230504.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 @@ -1257,9 +1255,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Apr 18 2023 Liwei Ge - 102.9.0-1.0.1 -- Rebrand to Anolis -- Remove loongarch64 arch(Zhao Hang) +* Thu May 04 2023 Eike Rathke - 102.11.0-1 +- Update to 102.11.0 build1 * Tue Apr 11 2023 Eike Rathke - 102.10.0-2 - Update to 102.10.0 build2 -- Gitee From 89b7b2e4287187d11e08abf031da8cdaf6d1b0bd 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 --- ...js => thunderbird-anolis-default-prefs.js.an7 | 2 +- thunderbird.spec | 16 +++++++++++----- 2 files changed, 12 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 97728a7..297461e 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 9 end @@ -166,7 +167,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 102.11.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -189,6 +190,7 @@ ExcludeArch: %{ix86} %if 0%{?rhel} == 7 ExcludeArch: aarch64 s390 ppc %endif +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 @@ -198,7 +200,7 @@ Source1: thunderbird-langpacks-%{version}-20230504.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 @@ -1255,6 +1257,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu May 18 2023 Liwei Ge - 102.11.0-1.0.1 +- Rebrand to Anolis +- Remove loongarch64 arch(Zhao Hang) + * Thu May 04 2023 Eike Rathke - 102.11.0-1 - Update to 102.11.0 build1 -- Gitee