From fc4ef50623f4b344bbaa7ccf49b330475f855e0f Mon Sep 17 00:00:00 2001 From: Renbo Date: Thu, 30 Nov 2023 18:08:37 +0800 Subject: [PATCH 1/2] update to thunderbird-115.5.0-1 Signed-off-by: Renbo --- dist | 2 +- download | 4 +- ...an8 => thunderbird-redhat-default-prefs.js | 2 +- thunderbird.spec | 39 ++++++++++++------- 4 files changed, 28 insertions(+), 19 deletions(-) rename thunderbird-anolis-default-prefs.js.an8 => thunderbird-redhat-default-prefs.js (96%) diff --git a/dist b/dist index 5aa45c5..37a6f9c 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8_9 diff --git a/download b/download index fa8f8b9..1d5f619 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ 9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -16f8a8028a91c36f00a627fe6f6d9d71 thunderbird-115.4.1.processed-source.tar.xz -ac368733170f92a751093993784077c5 thunderbird-langpacks-115.4.1-20231025.tar.xz +322656f39a60b5bd18cc6726ad061657 thunderbird-115.5.0.processed-source.tar.xz +bf109bcf39465089906ba1df6f8041d0 thunderbird-langpacks-115.5.0-20231121.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 89edcf1..2aa3671 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 9 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.4.1 -Release: 1%{anolis_release}%{?dist} +Version: 115.5.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -144,16 +143,20 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + # Started to ship on aarch64 in RHEL 8.2, on s390x in RHEL 8.3 %if %{rhel_minor_version} == 1 -ExcludeArch: %{ix86} aarch64 s390x +ExcludeArch: %{ix86} s390x aarch64 %else + %if %{rhel_minor_version} == 2 +ExcludeArch: %{ix86} s390x + %else ExcludeArch: %{ix86} + %endif %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +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. @@ -162,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}-20231025.tar.xz +Source1: thunderbird-langpacks-%{version}-20231121.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 @@ -1016,6 +1019,13 @@ echo "ac_add_options --with-mozilla-api-keyfile=`pwd`/mozilla-api-key" >> .mozco echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc-api-key" >> .mozconfig echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig +# May result in empty --with-libclang-path= in earlier versions. +# So far this is needed only for c8s. +%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 +# Clang 17 upstream's detection fails, tell it where to look. +echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig +%endif + echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig # Remove executable bit to make brp-mangle-shebangs happy. @@ -1504,9 +1514,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Nov 01 2023 Liwei Ge - 115.4.1-1.0.1 -- Rebrand to Anolis -- Remove loongarch64 arch(Zhao Hang) +* Tue Nov 21 2023 Eike Rathke - 115.5.0-1 +- Update to 115.5.0 build1 * Wed Oct 25 2023 Eike Rathke - 115.4.1-1 - Update to 115.4.1 build1 -- Gitee From 309a5c4cace47040529c4a3062b353b49dd912c4 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 2aa3671..8469f64 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 9 + 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.5.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}-20231121.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 +* Thu Nov 30 2023 Liwei Ge - 115.5.0-1.0.1 +- Rebrand to Anolis +- Remove loongarch64 arch(Zhao Hang) + * Tue Nov 21 2023 Eike Rathke - 115.5.0-1 - Update to 115.5.0 build1 -- Gitee