Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2022-05-18 00:13:14 +00:00 committed by Stepan Oksanichenko
commit 4aea88ce13
3 changed files with 18 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.8.0.processed-source.tar.xz SOURCES/thunderbird-91.9.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-91.8.0-20220405.tar.xz SOURCES/thunderbird-langpacks-91.9.0-20220503.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
7f97946153fe61dd7da01fdb3e2e367c7f24bcf5 SOURCES/thunderbird-91.8.0.processed-source.tar.xz e012b11182f73663668bd7f3ebe84acd6e51b44d SOURCES/thunderbird-91.9.0.processed-source.tar.xz
23d8ffc635a34725c989f591cc074f329b8e35db SOURCES/thunderbird-langpacks-91.8.0-20220405.tar.xz 7cc62140aef4a07dec14fcae4103f57e11859ec1 SOURCES/thunderbird-langpacks-91.9.0-20220503.tar.xz

View File

@ -19,7 +19,7 @@ function dist_to_rhel_minor(str, start)
end end
match = string.match(str, ".el8") match = string.match(str, ".el8")
if match then if match then
return 6 return 7
end end
end} end}
@ -127,8 +127,8 @@ end}
%global build_langpacks 1 %global build_langpacks 1
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 91.8.0 Version: 91.9.0
Release: 1%{?dist}.alma Release: 3%{?dist}.alma
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
@ -150,7 +150,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}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220405.tar.xz Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220503.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: get-calendar-langpacks.sh Source3: get-calendar-langpacks.sh
@ -1107,9 +1107,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Tue May 17 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.8.0-1.alma * Wed May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.9.0-3.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Tue May 03 2022 Eike Rathke <erack@redhat.com> - 91.9.0-3
- Update to 91.9.0 build3
* Mon May 02 2022 Eike Rathke <erack@redhat.com> - 91.9.0-2
- Update to 91.9.0 build2
* Thu Apr 28 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
- Update to 91.9.0
* Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1 * Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
- Update to 91.8.0 - Update to 91.8.0