From ad56e7a77456b6497d8461e94faea629bac8bf3e Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jul 26 2022 13:51:17 +0000 Subject: import and debrand thunderbird-91.11.0-2.el9_0 --- diff --git a/.gitignore b/.gitignore index 45ac021..dd9a6c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm -SOURCES/thunderbird-91.10.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz +SOURCES/thunderbird-91.11.0.b2.processed-source.tar.xz +SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 9fe2363..42a3ade 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm -3ad159989de51587768618bd07f3f076f51202dc SOURCES/thunderbird-91.10.0.processed-source.tar.xz -51bd5b9f0aaeab733e6b88387a64870602d8a154 SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz +98d87b884e38d175db17bc9ff414d0d42a091fa4 SOURCES/thunderbird-91.11.0.b2.processed-source.tar.xz +66375e7d02209121c1ebfd07f96cb35e260d8885 SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index aac1456..1284ffa 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -129,14 +129,14 @@ end} # Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive. # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # thunderbird-91.9.0.b2.processed-source.tar.xz -# With does_not_exist it's empty and source file name as is. -#global buildnum %{?does_not_exist} -%global buildnum %{?does_not_exist} +# 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.10.0 -Release: 1%{?dist} +Version: 91.11.0 +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -158,7 +158,7 @@ ExcludeArch: 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}-20220530.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -449,7 +449,7 @@ echo "use_rustts %{?use_rustts}" %patch516 -p1 -b .expat-CVE-2022-25235 %patch517 -p1 -b .expat-CVE-2022-25236 %patch518 -p1 -b .expat-CVE-2022-25315 -#patch237 -p1 -b .disable-openpgp-in-thunderbird +%patch237 -p1 -b .disable-openpgp-in-thunderbird %patch1001 -p1 -b .ppc64le-inline @@ -1028,7 +1028,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* # Removing librnp.so - we cannot deliver that in RHELs -#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so +%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so # Register as an application to be visible in the software center mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo @@ -1115,9 +1115,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Thu Jun 02 2022 CentOS Sources - 91.10.0-1.el9.centos +* Thu Jun 30 2022 CentOS Sources - 91.11.0-2.el9.centos - Apply debranding changes +* Tue Jun 28 2022 Eike Rathke - 91.11.0-2 +- Update to 91.11.0 build2 + +* Thu Jun 23 2022 Eike Rathke - 91.11.0-1 +- Update to 91.11.0 build1 + * Mon May 30 2022 Eike Rathke - 91.10.0-1 - Update to 91.10.0 build1