diff --git a/.gitignore b/.gitignore index 6bb422a..b02e6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,5 @@ 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.12.0.source.tar.xz -SOURCES/thunderbird-langpacks-78.12.0-20210708.tar.xz +SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index cf47f4f..bfbc2d9 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 -48303a0be781a239ceabe1203959d0eb93ec44ae SOURCES/thunderbird-78.12.0.source.tar.xz -f6afcbd3be150a9699dbf5cb30f3a4d7263ee2e4 SOURCES/thunderbird-langpacks-78.12.0-20210708.tar.xz +98228bff32bf6cb7e0e34eb135a800d3200881c1 SOURCES/thunderbird-78.12.0.source.tar.xz +a331ca78bb12b64578021ededef270d98a5762a5 SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index f562663..ffd684a 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -16,10 +16,14 @@ function dist_to_rhel_minor(str, start) if match then return string.sub(match, 6) end + match = string.match(str, ".el8") + if match then + return 5 + end return -1 end} -%global rhel_minor_version 4 +%global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))} %global system_nss 1 %global bundle_nss 0 @@ -190,7 +194,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 78.12.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -205,7 +209,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}-20210708.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210712.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz @@ -1342,7 +1346,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 # Register as an application to be visible in the software center # @@ -1508,6 +1512,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jul 12 2021 Eike Rathke - 78.12.0-2 +- Update to 78.12.0 build2 + * Thu Jul 08 2021 Eike Rathke - 78.12.0-1 - Update to 78.12.0 build1