From 0caf612f3cbec0ab0804c2557c78038b2c324791 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jun 09 2021 16:42:07 +0000 Subject: Import and Debrand thunderbird-78.11.0-1.el7_9 --- diff --git a/.gitignore b/.gitignore index 669a386..ab95805 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,6 @@ SOURCES/nodejs-10.21.0-5.fc32.src.rpm SOURCES/nspr-4.25.0-1.el8_0.src.rpm SOURCES/nss-3.53.1-3.fc32.src.rpm SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -SOURCES/thunderbird-78.10.0.source.tar.xz -SOURCES/thunderbird-langpacks-78.10.0-20210421.tar.xz +SOURCES/thunderbird-78.11.0.source.tar.xz +SOURCES/thunderbird-langpacks-78.11.0-20210531.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 50575fa..c84be99 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -6,6 +6,6 @@ e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm 07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm 223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm -4485a2f5eff0ff87b77adcf175c4a920a7cf54d2 SOURCES/thunderbird-78.10.0.source.tar.xz -a6e69d9f51eef3128fbb03125a271f566d17735a SOURCES/thunderbird-langpacks-78.10.0-20210421.tar.xz +19b6827a233ae88488a7de4e9f988610cccca9ea SOURCES/thunderbird-78.11.0.source.tar.xz +e12ad30bdf8288817f0b61c3d6322d57086cf161 SOURCES/thunderbird-langpacks-78.11.0-20210531.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 8ecd90f..d16eb5b 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -11,6 +11,9 @@ %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8" +%global rhel_minor_version 5 +%endif +%if "%{?dist}" == ".el8_4" %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8_3" @@ -194,7 +197,7 @@ %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.10.0 +Version: 78.11.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -210,7 +213,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210421.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210531.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz @@ -579,7 +582,7 @@ echo "use_bundled_yasm %{?use_bundled_yasm}" %endif %patch236 -p1 -b .fedora-shebang-build -#patch237 -p1 -b .disable-openpgp-in-thunderbird +%patch237 -p1 -b .disable-openpgp-in-thunderbird %if 0%{?rhel} == 6 %patch232 -p1 -b .hugepage @@ -1341,7 +1344,7 @@ test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-segmentation/s test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/unicode.py" && sed -i -e 's|/usr/bin/env python$|/usr/bin/env python2|' %{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/unicode.py # Removing librnp.so - we cannot deliver that in RHELs -# {__rm} -rf %{buildroot}%{mozappdir}/librnp.so +%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so #--------------------------------------------------------------------- @@ -1457,6 +1460,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon May 31 2021 Eike Rathke - 78.11.0-1 +- Update to 78.11.0 build1 + * Wed Apr 21 2021 Eike Rathke - 78.10.0-1 - Update to 78.10.0