Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-05-18 06:16:10 +00:00 committed by Stepan Oksanichenko
commit 391b0a0502
3 changed files with 12 additions and 10 deletions

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-11.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm
SOURCES/thunderbird-102.10.0.b2.processed-source.tar.xz SOURCES/thunderbird-102.11.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-102.10.0-20230411.tar.xz SOURCES/thunderbird-langpacks-102.11.0-20230504.tar.xz
SOURCES/thunderbird-symbolic.svg SOURCES/thunderbird-symbolic.svg

View File

@ -1,6 +1,6 @@
2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
6ff5d7cb41d859de65b276e927bfb0b5c8252878 SOURCES/thunderbird-102.10.0.b2.processed-source.tar.xz 7ffefde4550bd8ad0557ec011e9bd921d145ae3d SOURCES/thunderbird-102.11.0.processed-source.tar.xz
5802aa1e1e4bce6e932d50cbd94804427dd85227 SOURCES/thunderbird-langpacks-102.10.0-20230411.tar.xz c030353a3e2d3e1d060d44b7e316c89672742ee6 SOURCES/thunderbird-langpacks-102.11.0-20230504.tar.xz
42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg 42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg

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 7 return 9
end end
return -1 return -1
end} end}
@ -165,8 +165,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 102.10.0 Version: 102.11.0
Release: 2%{?dist}.alma Release: 1%{?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+
@ -174,7 +174,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# 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-102.8.0.b2.processed-source.tar.xz # thunderbird-102.8.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
%if 0%{?rhel} == 9 %if 0%{?rhel} == 9
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
@ -193,7 +193,7 @@ ExcludeArch: aarch64 s390 ppc
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.processed-source.tar.xz #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.processed-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}-20230411.tar.xz Source1: thunderbird-langpacks-%{version}-20230504.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1255,9 +1255,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Mon Apr 17 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.10.0-2.alma * Thu May 18 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.11.0-1.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
- Update to 102.11.0 build1
* Tue Apr 11 2023 Eike Rathke <erack@redhat.com> - 102.10.0-2 * Tue Apr 11 2023 Eike Rathke <erack@redhat.com> - 102.10.0-2
- Update to 102.10.0 build2 - Update to 102.10.0 build2