Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2023-04-17 13:44:46 +00:00 committed by Stepan Oksanichenko
commit 04471a5a94
3 changed files with 19 additions and 13 deletions

6
.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-6.el8_1.src.rpm SOURCES/nss-3.79.0-11.el8_1.src.rpm
SOURCES/thunderbird-102.9.0.processed-source.tar.xz SOURCES/thunderbird-102.10.0.b2.processed-source.tar.xz
SOURCES/thunderbird-langpacks-102.9.0-20230313.tar.xz SOURCES/thunderbird-langpacks-102.10.0-20230411.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
fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
3db971cffa9dff81fdd30cabf6b4128563752781 SOURCES/thunderbird-102.9.0.processed-source.tar.xz 6ff5d7cb41d859de65b276e927bfb0b5c8252878 SOURCES/thunderbird-102.10.0.b2.processed-source.tar.xz
761f69915db0df9ec2ac9d85e478c555605ce8ff SOURCES/thunderbird-langpacks-102.9.0-20230313.tar.xz 5802aa1e1e4bce6e932d50cbd94804427dd85227 SOURCES/thunderbird-langpacks-102.10.0-20230411.tar.xz
42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg 42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg

View File

@ -165,8 +165,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 102.9.0 Version: 102.10.0
Release: 1%{?dist}.alma Release: 2%{?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}-20230313.tar.xz Source1: thunderbird-langpacks-%{version}-20230411.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -206,7 +206,7 @@ Source25: thunderbird-symbolic.svg
Source27: google-api-key Source27: google-api-key
Source32: node-stdout-nonblocking-wrapper Source32: node-stdout-nonblocking-wrapper
Source35: google-loc-api-key Source35: google-loc-api-key
Source403: nss-3.79.0-6.el8_1.src.rpm Source403: nss-3.79.0-11.el8_1.src.rpm
Source401: nss-setup-flags-env.inc Source401: nss-setup-flags-env.inc
Source402: nspr-4.34.0-3.el8_1.src.rpm Source402: nspr-4.34.0-3.el8_1.src.rpm
@ -1255,10 +1255,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Wed Mar 22 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.9.0-1.alma * Mon Apr 17 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.10.0-2.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Mon Mar 13 2023 Eike Rathke <erack@redhat.com> - 102.9.0-1 * Tue Apr 11 2023 Eike Rathke <erack@redhat.com> - 102.10.0-2
- Update to 102.10.0 build2
* Thu Apr 06 2023 Eike Rathke <erack@redhat.com> - 102.10.0-1
- Update to 102.10.0 build1
* Mon Mar 13 2023 Eike Rathke <erack@redhat.com> - 102.9.0-2
- Update to 102.9.0 build1 - Update to 102.9.0 build1
* Wed Feb 15 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2 * Wed Feb 15 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
- Update to 102.8.0 build2 - Update to 102.8.0 build2