Merge branch 'a8' into a8-plus

This commit is contained in:
eabdullin 2023-09-05 22:36:01 +03:00 committed by eabdullin
commit 69aaa67e04
3 changed files with 20 additions and 10 deletions

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
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.13.0.b2.processed-source.tar.xz SOURCES/thunderbird-102.15.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz SOURCES/thunderbird-langpacks-102.15.0-20230828.tar.xz

View File

@ -1,5 +1,5 @@
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
7d2ee2fbb3f527e7062e32a1f13b06177c8a3cf3 SOURCES/thunderbird-102.13.0.b2.processed-source.tar.xz 328b34b1c10a251a49ff7c047fb09f4195a2894f SOURCES/thunderbird-102.15.0.processed-source.tar.xz
cdf9e5ddff298c2b5690456a66c3868a44a382b3 SOURCES/thunderbird-langpacks-102.13.0-20230707.tar.xz 0dd2e6ee4bda9d8faa77c0e7ead56a84c5f62a96 SOURCES/thunderbird-langpacks-102.15.0-20230828.tar.xz

View File

@ -183,8 +183,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 102.13.0 Version: 102.15.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+
@ -192,7 +192,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}
@ -211,7 +211,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}-20230707.tar.xz Source1: thunderbird-langpacks-%{version}-20230828.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1275,11 +1275,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Fri Jul 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.13.0-2.alma.plus * Tue Sep 05 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.0-1.alma.plus
- Enable openpgp - Enable openpgp
* Fri Jul 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.13.0-2.alma * Tue Sep 05 2023 Eduard Abdullin <eabdullin@almalinux.org> - 102.15.0-1.alma
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Mon Aug 28 2023 Eike Rathke <erack@redhat.com> - 102.15.0-1
- Update to 102.15.0 build1
* Wed Aug 09 2023 Eike Rathke <erack@redhat.com> - 102.14.0-3
- Bump NVR to rebuild
* Wed Aug 09 2023 Jan Horak <jhorak@redhat.com> - 102.14.0-2
- Rebuild due to rhbz#2228948
* Tue Aug 01 2023 Eike Rathke <erack@redhat.com> - 102.14.0-1
- Update to 102.14.0 build1
* Fri Jul 07 2023 Eike Rathke <erack@redhat.com> - 102.13.0-2 * Fri Jul 07 2023 Eike Rathke <erack@redhat.com> - 102.13.0-2
- Update to 102.13.0 build2 - Update to 102.13.0 build2