Merge branch 'c9' into a9-plus

This commit is contained in:
eabdullin 2022-07-01 08:38:52 +03:00
commit 3fe84b1615
3 changed files with 17 additions and 11 deletions

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nspr-4.32.0-1.el8_1.src.rpm
SOURCES/nss-3.67.0-7.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-91.11.0.b2.processed-source.tar.xz
SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz

View File

@ -1,5 +1,5 @@
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.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 98d87b884e38d175db17bc9ff414d0d42a091fa4 SOURCES/thunderbird-91.11.0.b2.processed-source.tar.xz
51bd5b9f0aaeab733e6b88387a64870602d8a154 SOURCES/thunderbird-langpacks-91.10.0-20220530.tar.xz 66375e7d02209121c1ebfd07f96cb35e260d8885 SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz

View File

@ -129,14 +129,14 @@ end}
# Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive. # 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. # 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 # thunderbird-91.9.0.b2.processed-source.tar.xz
# With does_not_exist it's empty and source file name as is. # When unset use processed source file name as is.
#global buildnum %{?does_not_exist} #global buildnum .b2
%global buildnum %{?does_not_exist} %global buildnum .b2
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 91.10.0 Version: 91.11.0
Release: 1%{?dist}.alma.plus Release: 2%{?dist}.alma.plus
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet 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 # 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 Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220530.tar.xz Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220628.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: get-calendar-langpacks.sh Source3: get-calendar-langpacks.sh
@ -1115,9 +1115,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Thu Jun 02 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.10.0-1.alma * Fri Jul 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.11.0-2.alma.plus
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Tue Jun 28 2022 Eike Rathke <erack@redhat.com> - 91.11.0-2
- Update to 91.11.0 build2
* Thu Jun 23 2022 Eike Rathke <erack@redhat.com> - 91.11.0-1
- Update to 91.11.0 build1
* Mon May 30 2022 Eike Rathke <erack@redhat.com> - 91.10.0-1 * Mon May 30 2022 Eike Rathke <erack@redhat.com> - 91.10.0-1
- Update to 91.10.0 build1 - Update to 91.10.0 build1