Compare commits

...

6 Commits

Author SHA1 Message Date
eabdullin fe81d0d7a4 import CS thunderbird-115.11.0-1.el8 2024-05-20 07:04:32 +00:00
Andrew Lukoshko 90eb058f58 Revert EuroLinux modifications 2024-04-01 09:08:56 +00:00
Andrew Lukoshko 9e3c81ba50 import EuroLinux thunderbird-115.9.0-1.el8_9 2024-04-01 09:08:38 +00:00
eabdullin 4bf75f4a7b import CS thunderbird-115.8.0-1.el8 2024-02-27 13:57:30 +00:00
eabdullin d285338771 import CS thunderbird-115.7.0-1.el9 2024-01-31 07:07:10 +00:00
eabdullin 407640a7ab import CS thunderbird-115.6.0-1.el8 2024-01-04 07:21:23 +00:00
4 changed files with 40 additions and 17 deletions

4
.gitignore vendored
View File

@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.90.0-2.el8_1.src.rpm SOURCES/nss-3.90.0-2.el8_1.src.rpm
SOURCES/nss-3.90.0-3.el9_0.src.rpm SOURCES/nss-3.90.0-3.el9_0.src.rpm
SOURCES/thunderbird-115.5.0.processed-source.tar.xz SOURCES/thunderbird-115.11.0.processed-source.tar.xz
SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz SOURCES/thunderbird-langpacks-115.11.0-20240513.tar.xz

View File

@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm 39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
5a7ac4a9bd48e160ad1fcac18f4bb2660f5672e1 SOURCES/thunderbird-115.5.0.processed-source.tar.xz b49c034c5add68d6ed21941260f81ff19de310f9 SOURCES/thunderbird-115.11.0.processed-source.tar.xz
659e4bde9e34477277c3a7e6d09457cbe9340b44 SOURCES/thunderbird-langpacks-115.5.0-20231121.tar.xz c7dd3c6b5bf0a940cf27e4f2cf39ba53c2156116 SOURCES/thunderbird-langpacks-115.11.0-20240513.tar.xz

View File

@ -1,11 +1,11 @@
--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200 --- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2024-02-12 21:53:56.000000000 +0200
+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200 +++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py 2024-02-14 16:48:12.476182627 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir @@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
from mozfile import which from packaging.version import Version
from six import PY3 from six import PY3
-NODE_MIN_VERSION = StrictVersion("12.22.12") -NODE_MIN_VERSION = Version("12.22.12")
+NODE_MIN_VERSION = StrictVersion("10.24.0") +NODE_MIN_VERSION = Version("10.24.0")
NPM_MIN_VERSION = StrictVersion("6.14.16") NPM_MIN_VERSION = Version("6.14.16")

View File

@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end end
match = string.match(str, ".el9") match = string.match(str, ".el9")
if match then if match then
return 4 return 5
end end
return -1 return -1
end} end}
@ -124,7 +124,7 @@ end}
# 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
%bcond_without langpacks %bcond_without langpacks
@ -134,7 +134,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 115.5.0 Version: 115.11.0
Release: 1%{?dist} Release: 1%{?dist}
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+
@ -165,7 +165,7 @@ ExcludeArch: aarch64 s390 ppc ppc64
#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 %{with langpacks} %if %{with langpacks}
Source1: thunderbird-langpacks-%{version}-20231121.tar.xz Source1: thunderbird-langpacks-%{version}-20240513.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -1419,9 +1419,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml" sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
#=============================================================================== # Clean the created bundled rpms.
%clean
rm -rf %{_srcrpmdir}/libffi*.src.rpm rm -rf %{_srcrpmdir}/libffi*.src.rpm
find %{_rpmdir} -name "libffi*.rpm" -delete find %{_rpmdir} -name "libffi*.rpm" -delete
rm -rf %{_srcrpmdir}/openssl*.src.rpm rm -rf %{_srcrpmdir}/openssl*.src.rpm
@ -1431,6 +1429,8 @@ find %{_rpmdir} -name "nss*.rpm" -delete
rm -rf %{_srcrpmdir}/nspr*.src.rpm rm -rf %{_srcrpmdir}/nspr*.src.rpm
find %{_rpmdir} -name "nspr*.rpm" -delete find %{_rpmdir} -name "nspr*.rpm" -delete
#===============================================================================
%post %post
update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -1514,6 +1514,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Mon May 13 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Update to 115.11.0 build2
* Mon Apr 15 2024 Eike Rathke <erack@redhat.com> - 115.10.0-2
- Update to 115.10.0 build2
* Fri Apr 12 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1
- Revert expat CVE-2023-52425 fix
* Mon Mar 18 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1
- Update to 115.9.0 build1
- Fix expat CVE-2023-52425
* Mon Feb 19 2024 Eike Rathke <erack@redhat.com> - 115.8.0-1
- Update to 115.8.0 build1
* Mon Jan 22 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
- Update to 115.7.0 build1
* Mon Dec 18 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
- Update to 115.6.0 build2
* Tue Nov 21 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1 * Tue Nov 21 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
- Update to 115.5.0 build1 - Update to 115.5.0 build1