From 380a76249595cb579e4f930f0a4fe30099098f78 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 25 Aug 2022 02:10:00 +0800 Subject: [PATCH 1/2] update to thunderbird-91.13.0-1.el7_9 Signed-off-by: anolis-bot --- dist | 1 + download | 4 ++-- ... thunderbird-redhat-default-prefs.js.rhel7 | 2 +- thunderbird.spec | 20 +++++++++---------- 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 dist rename thunderbird-anolis-default-prefs.js.el7 => thunderbird-redhat-default-prefs.js.rhel7 (96%) diff --git a/dist b/dist new file mode 100644 index 0000000..ad8eb77 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7_9 diff --git a/download b/download index e268417..4542e58 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -dfc2fe10f832bc4108d2c66337b06e98 thunderbird-91.12.0.processed-source.tar.xz -5304fa7c57277183472da52b0b063eba thunderbird-langpacks-91.12.0-20220725.tar.xz +c755bcbd736dc7f21b2f2afa0c5b99e1 thunderbird-91.13.0.processed-source.tar.xz +ab05c04b33f62fcd06ce1647dff97c33 thunderbird-langpacks-91.13.0-20220819.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.el7 b/thunderbird-redhat-default-prefs.js.rhel7 similarity index 96% rename from thunderbird-anolis-default-prefs.js.el7 rename to thunderbird-redhat-default-prefs.js.rhel7 index 1d192b1..4d01b78 100644 --- a/thunderbird-anolis-default-prefs.js.el7 +++ 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"); +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 11e4781..0f27d9c 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 @@ -136,8 +135,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.12.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.13.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -153,17 +152,17 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use -# licenses that are rejected by Anolis Legal. +# licenses that are rejected by Red Hat Legal. # The official tarball has to be always processed by the process-official-tarball # script. # 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}-20220725.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220819.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -175,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.el7 +Source701: thunderbird-redhat-default-prefs.js.rhel7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -329,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 @@ -1131,8 +1131,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Wed Aug 10 2022 Liwei Ge - 91.12.0-1.0.1 -- Rebrand to Anolis +* Fri Aug 19 2022 Eike Rathke - 91.13.0-1 +- Update to 91.13.0 build1 * Mon Jul 25 2022 Eike Rathke - 91.12.0-1 - Update to 91.12.0 build1 -- Gitee From f29885876dd2a19615d9a67fc7562f3d0a2eeed6 Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Wed, 10 Aug 2022 13:58:00 +0800 Subject: [PATCH 2/2] rebrand to anolis Signed-off-by: yangxianzhao --- ...l7 => thunderbird-anolis-default-prefs.js.el7 | 2 +- thunderbird.spec | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) rename thunderbird-redhat-default-prefs.js.rhel7 => thunderbird-anolis-default-prefs.js.el7 (96%) diff --git a/thunderbird-redhat-default-prefs.js.rhel7 b/thunderbird-anolis-default-prefs.js.el7 similarity index 96% rename from thunderbird-redhat-default-prefs.js.rhel7 rename to thunderbird-anolis-default-prefs.js.el7 index 4d01b78..1d192b1 100644 --- a/thunderbird-redhat-default-prefs.js.rhel7 +++ b/thunderbird-anolis-default-prefs.js.el7 @@ -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"); 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 0f27d9c..d05d268 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.13.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 @@ -152,11 +153,11 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use -# licenses that are rejected by Red Hat Legal. +# licenses that are rejected by Anolis Legal. # The official tarball has to be always processed by the process-official-tarball # script. # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz @@ -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.el7 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,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu Aug 25 2022 Liwei Ge - 91.13.0-1.0.1 +- Rebrand to Anolis +- Cherry-pick [456c45a] + * Fri Aug 19 2022 Eike Rathke - 91.13.0-1 - Update to 91.13.0 build1 -- Gitee