Merge remote-tracking branch 'origin/c8' into a8-plus

This commit is contained in:
Andrew Lukoshko 2022-08-02 12:45:34 +00:00
commit 7cdcb34e3f
3 changed files with 11 additions and 9 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.11.0.b2.processed-source.tar.xz SOURCES/thunderbird-91.12.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz SOURCES/thunderbird-langpacks-91.12.0-20220725.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
98d87b884e38d175db17bc9ff414d0d42a091fa4 SOURCES/thunderbird-91.11.0.b2.processed-source.tar.xz e200f143a28a7f7d5759a06ae11e52aec7a896a4 SOURCES/thunderbird-91.12.0.processed-source.tar.xz
66375e7d02209121c1ebfd07f96cb35e260d8885 SOURCES/thunderbird-langpacks-91.11.0-20220628.tar.xz 992480ecc2d5671a883758677d44d3ec6ff04d42 SOURCES/thunderbird-langpacks-91.12.0-20220725.tar.xz

View File

@ -132,12 +132,11 @@ end}
# thunderbird-91.9.0.b2.processed-source.tar.xz # thunderbird-91.9.0.b2.processed-source.tar.xz
# When unset use processed source file name as is. # When unset use processed source file name as is.
#global buildnum .b2 #global buildnum .b2
%global buildnum .b2
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 91.11.0 Version: 91.12.0
Release: 2%{?dist}.alma.plus Release: 1%{?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
@ -163,7 +162,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 # 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}-20220628.tar.xz Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220725.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: get-calendar-langpacks.sh Source3: get-calendar-langpacks.sh
@ -1132,9 +1131,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Fri Jul 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.11.0-2.alma.plus * Mon Jul 25 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.12.0-1.alma.plus
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Mon Jul 25 2022 Eike Rathke <erack@redhat.com> - 91.12.0-1
- Update to 91.12.0 build1
* Tue Jun 28 2022 Eike Rathke <erack@redhat.com> - 91.11.0-2 * Tue Jun 28 2022 Eike Rathke <erack@redhat.com> - 91.11.0-2
- Update to 91.11.0 build2 - Update to 91.11.0 build2