From 7757252410cdb4f329270cee9612215d300ebee3 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 16 Feb 2022 11:22:18 +0800 Subject: [PATCH 1/2] update to thunderbird-91.6.0-1.el8_5 Signed-off-by: Renbo --- ...thunderbird-91.6.0.processed-source.tar.xz | 4 +- ...underbird-langpacks-91.6.0-20220207.tar.xz | 4 +- ... thunderbird-redhat-default-prefs.js.rhel7 | 2 +- thunderbird.spec | 61 ++++--------------- 4 files changed, 17 insertions(+), 54 deletions(-) rename thunderbird-91.5.0.processed-source.tar.xz => thunderbird-91.6.0.processed-source.tar.xz (32%) rename thunderbird-langpacks-91.5.0-20220107.tar.xz => thunderbird-langpacks-91.6.0-20220207.tar.xz (32%) rename thunderbird-anolis-default-prefs.js.an7 => thunderbird-redhat-default-prefs.js.rhel7 (96%) diff --git a/thunderbird-91.5.0.processed-source.tar.xz b/thunderbird-91.6.0.processed-source.tar.xz similarity index 32% rename from thunderbird-91.5.0.processed-source.tar.xz rename to thunderbird-91.6.0.processed-source.tar.xz index 4178b3e..129cdf9 100644 --- a/thunderbird-91.5.0.processed-source.tar.xz +++ b/thunderbird-91.6.0.processed-source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f394a1422c0a2a911a5f3e6af309e1e755027610bcb3a7c678c564956b2fa7bb -size 410497368 +oid sha256:c3b5ed97f2b1f7f08331e83d5917a6e86abed62c158eae462ff615f57d709ad6 +size 410308696 diff --git a/thunderbird-langpacks-91.5.0-20220107.tar.xz b/thunderbird-langpacks-91.6.0-20220207.tar.xz similarity index 32% rename from thunderbird-langpacks-91.5.0-20220107.tar.xz rename to thunderbird-langpacks-91.6.0-20220207.tar.xz index 918b5d8..daae7b1 100644 --- a/thunderbird-langpacks-91.5.0-20220107.tar.xz +++ b/thunderbird-langpacks-91.6.0-20220207.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b7a5ca6b256492ce6d2a26bbbad0fcd3a22221dd3fc09a838f1157d29a07c12 -size 36725420 +oid sha256:93b45820d10527402cc55abccd08dfcaaf8c84078458f45363bea6f97c1e79ff +size 37296636 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 7d5e4ff..f6f5ca2 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 @@ -129,8 +128,8 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.5.0 -Release: 1%{anolis_release}%{?dist} +Version: 91.6.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -156,7 +155,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}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220107.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220207.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -168,7 +167,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 @@ -319,7 +318,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 @@ -1023,47 +1023,10 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -%{__mkdir_p} %{buildroot}%{_datadir}/appdata -cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml < - - - - mozilla-thunderbird.desktop - CC0-1.0 - MPLv1.1 or GPLv2+ or LGPLv2+ - -

- Thunderbird is an email client that allows you to read, write and organise all - of your email messages. It is compatible with most email accounts, including the - most popular webmail services. -

-

- Thunderbird is designed by Mozilla, a global community working together to make - the Internet better. Mozilla believe that the Internet should be open, public, - and accessible to everyone without any restrictions. -

-
    -
  • Easier than ever to set up a new e-mail account
    • -
  • Awesome search allows you to find your messages fast
    • -
  • Thousands of add-ons give you the freedom to make Thunderbird your own
    • -
- - http://www.mozilla.org/thunderbird/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png - - - - - - -EOF + +# Register as an application to be visible in the software center +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml #--------------------------------------------------------------------- @@ -1155,8 +1118,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Fri Jan 14 2022 zhangbinchen - 91.5.0-1.0.1 -- Rename default js file and update vendor +* Mon Feb 07 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 * Fri Jan 07 2022 Eike Rathke - 91.5.0-1 - Update to 91.5.0 build1 -- Gitee From cd1e204b4eda12cb7009a023cb73dfdf43f47ad9 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 f6f5ca2..214c9b7 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 @@ -129,7 +130,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 91.6.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 @@ -167,7 +168,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 @@ -318,8 +319,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 @@ -1118,6 +1118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Feb 16 2022 zhangbinchen - 91.6.0-1.0.1 +- Rename default js file and update vendor + * Mon Feb 07 2022 Eike Rathke - 91.6.0-1 - Update to 91.6.0 build1 -- Gitee