diff --git a/download b/download index 673ec0b43454d5a10356f5769e544ec8fad363f5..fafe08e442f814f855cef2dc33c7a840ab6964db 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ 9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz 5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm 770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm -decbd451b2ad766e001af9bf99e75548 thunderbird-91.7.0.processed-source.tar.xz -4aaa4c730658fc8b60372812053b874e thunderbird-langpacks-91.7.0-20220308.tar.xz +1ffb816848b43cf4f9e5f130296f504c thunderbird-91.8.0.processed-source.tar.xz +1cd425a3bee96c3f97efb59932e7ce51 thunderbird-langpacks-91.8.0-20220405.tar.xz diff --git a/python-missing-utimensat.patch b/python-missing-utimensat.patch new file mode 100644 index 0000000000000000000000000000000000000000..d19ecabfe6da3580ee56a89aad33c977046a3c5f --- /dev/null +++ b/python-missing-utimensat.patch @@ -0,0 +1,12 @@ +diff -up python3/Python-3.6.8/configure.old python3/Python-3.6.8/configure +--- Python-3.6.8/configure.old 2019-10-01 12:56:35.074551835 +0200 ++++ Python-3.6.8/configure 2019-10-01 12:56:44.240517798 +0200 +@@ -11438,7 +11438,7 @@ for ac_func in alarm accept4 setitimer g + sigaction sigaltstack siginterrupt sigpending sigrelse \ + sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \ + sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ +- truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \ ++ truncate uname unlinkat unsetenv utimes waitid waitpid wait3 wait4 \ + wcscoll wcsftime wcsxfrm wmemcmp writev _getpty + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 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 1d192b118c3400135cd8897caa6ecbc6cc25feba..4d01b7833b018d0bf5fe31dab6d5e578aadc53ec 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 c00e7633e8ba299218f01118d36fc09635f20578..c318f091535933dac7ee3789ea34e6ad29bc3d50 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.7.0 -Release: 2%{anolis_release}%{?dist} +Version: 91.8.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -146,17 +145,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}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220308.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220405.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.el7 +Source701: thunderbird-redhat-default-prefs.js.rhel7 Source403: nss-3.67.0-7.el8_1.src.rpm Source401: nss-setup-flags-env.inc @@ -177,6 +176,7 @@ Source402: nspr-4.32.0-1.el8_1.src.rpm # Build patches # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 Patch1001: build-ppc64le-inline.patch +Patch1003: python-missing-utimensat.patch Patch1008: build-rhel7-nasm-dwarf.patch Patch1009: build-debuginfo-fix.patch # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 @@ -1124,8 +1124,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Mar 15 2022 Zhang xianting - 91.7.0-2.0.1 -- Rebrand to Anolis +* Tue Apr 05 2022 Eike Rathke - 91.8.0-1 +- Update to 91.8.0 * Tue Mar 08 2022 Eike Rathke - 91.7.0-2 - Update to 91.7.0 build2 @@ -1139,9 +1139,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Fri Jan 07 2022 Eike Rathke - 91.5.0-1 - Update to 91.5.0 build1 -* Tue Dec 07 2021 Eike Rathke - 91.4.0-3 -- Bump NVR for ppc64 build - * Mon Dec 06 2021 Eike Rathke - 91.4.0-2 - Update to 91.4.0 build2