From ee892aee367fb5e5e888392c3eaa69b5cd3e2df7 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 2 Aug 2022 13:52:09 +0800 Subject: [PATCH 1/2] update to thunderbird-91.12.0-1 Signed-off-by: Zhao Hang --- download | 4 ++-- ...=> thunderbird-redhat-default-prefs.js.rhel7 | 2 +- thunderbird.spec | 17 ++++++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) rename thunderbird-anolis-default-prefs.js.an7 => thunderbird-redhat-default-prefs.js.rhel7 (96%) diff --git a/download b/download index a045942..e268417 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -33251316033dc0596281c6d060dc87c4 thunderbird-91.11.0.b2.processed-source.tar.xz -61f9f8fe81ff4b47c7be8fb0dfc23cc2 thunderbird-langpacks-91.11.0-20220628.tar.xz +dfc2fe10f832bc4108d2c66337b06e98 thunderbird-91.12.0.processed-source.tar.xz +5304fa7c57277183472da52b0b063eba thunderbird-langpacks-91.12.0-20220725.tar.xz 5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm 770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm diff --git a/thunderbird-anolis-default-prefs.js.an7 b/thunderbird-redhat-default-prefs.js.rhel7 similarity index 96% rename from thunderbird-anolis-default-prefs.js.an7 rename to thunderbird-redhat-default-prefs.js.rhel7 index a3f8698..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js.an7 +++ b/thunderbird-redhat-default-prefs.js.rhel7 @@ -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 027f264..b53839a 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 @@ -133,12 +132,11 @@ end} # thunderbird-91.9.0.b2.processed-source.tar.xz # When unset use processed source file name as is. #global buildnum .b2 -%global buildnum .b2 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.11.0 -Release: 2%{anolis_release}%{?dist} +Version: 91.12.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -164,7 +162,7 @@ ExcludeArch: aarch64 s390 ppc # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220725.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -176,7 +174,7 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-anolis-default-prefs.js.an7 +Source701: thunderbird-redhat-default-prefs.js.rhel7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -330,7 +328,8 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -Requires: anolis-indexhtml +BuildRequires: system-bookmarks +Requires: redhat-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -1132,8 +1131,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Sat Jul 2 2022 Liwei Ge - 91.11.0-2.0.1 -- Rebrand to Anolis +* Mon Jul 25 2022 Eike Rathke - 91.12.0-1 +- Update to 91.12.0 build1 * Tue Jun 28 2022 Eike Rathke - 91.11.0-2 - Update to 91.11.0 build2 -- Gitee From 67879142aac4c9528be05f7e990150164836dea6 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.rhel7 => thunderbird-anolis-default-prefs.js.an7 | 2 +- thunderbird.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) rename thunderbird-redhat-default-prefs.js.rhel7 => thunderbird-anolis-default-prefs.js.an7 (96%) diff --git a/thunderbird-redhat-default-prefs.js.rhel7 b/thunderbird-anolis-default-prefs.js.an7 similarity index 96% rename from thunderbird-redhat-default-prefs.js.rhel7 rename to thunderbird-anolis-default-prefs.js.an7 index 4d01b78..a3f8698 100644 --- a/thunderbird-redhat-default-prefs.js.rhel7 +++ 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 b53839a..9bfbbed 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 @@ -136,7 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 91.12.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -174,7 +175,7 @@ Source21: thunderbird.sh.in Source24: mozilla-api-key Source27: google-api-key Source28: node-stdout-nonblocking-wrapper -Source701: thunderbird-redhat-default-prefs.js.rhel7 +Source701: thunderbird-anolis-default-prefs.js.an7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -328,8 +329,7 @@ Requires: nss >= %{nss_build_version} %endif BuildRequires: desktop-file-utils -BuildRequires: system-bookmarks -Requires: redhat-indexhtml +Requires: anolis-indexhtml %if %{?run_tests} BuildRequires: xorg-x11-server-Xvfb @@ -1131,6 +1131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Aug 02 2022 Liwei Ge - 91.12.0-1.0.1 +- Rebrand to Anolis + * Mon Jul 25 2022 Eike Rathke - 91.12.0-1 - Update to 91.12.0 build1 -- Gitee