From 5b02c44428f0eb0a3847adbdd8f82a3c41e091cb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 10 2021 12:25:25 +0000 Subject: import thunderbird-78.12.0-3.module+el8.4.0+11863+70a547a8 --- diff --git a/.gitignore b/.gitignore index ab95805..b02e6ba 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.11.0.source.tar.xz -SOURCES/thunderbird-langpacks-78.11.0-20210531.tar.xz +SOURCES/thunderbird-78.12.0.source.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 c84be99..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 -19b6827a233ae88488a7de4e9f988610cccca9ea SOURCES/thunderbird-78.11.0.source.tar.xz -e12ad30bdf8288817f0b61c3d6322d57086cf161 SOURCES/thunderbird-langpacks-78.11.0-20210531.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/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index c6e8be4..e382648 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -6,34 +6,30 @@ %global debug_package %{nil} %endif -%global rhel_minor_version -1 -%if 0%{?flatpak:1} -%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" -%global rhel_minor_version 3 -%endif -%if "%{?dist}" == ".el8_2" -%global rhel_minor_version 2 -%endif -%if "%{?dist}" == ".el8_1" -%global rhel_minor_version 1 -%endif -%if "%{?dist}" == ".el8_0" -%global rhel_minor_version 0 -%endif +%{lua: +function dist_to_rhel_minor(str, start) + match = string.match(str, ".module%+el8.%d+") + if match then + return string.sub(match, 13) + end + match = string.match(str, ".el8_%d+") + 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 %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))} %global system_nss 1 %global bundle_nss 0 %if 0%{?rhel} == 8 - %if 0%{?rhel_minor_version} < 2 + %if %{rhel_minor_version} < 2 %global bundle_nss 1 %endif %endif @@ -155,7 +151,7 @@ %define use_bundled_yasm 0 %if 0%{?rhel} == 8 - %if 0%{?rhel_minor_version} <= 2 + %if %{rhel_minor_version} <= 2 %define use_bundled_nodejs 1 %endif %endif @@ -197,8 +193,8 @@ %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.11.0 -Release: 1%{?dist} +Version: 78.12.0 +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -213,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}-20210531.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210712.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz @@ -406,7 +402,7 @@ BuildRequires: openssl-devel %endif %if 0%{?rhel} == 8 - %if 0%{?rhel_minor_version} >= 3 + %if %{rhel_minor_version} >= 3 BuildRequires: pkgconfig(libpipewire-0.3) %else BuildRequires: pipewire-devel @@ -535,7 +531,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client. %prep echo "Build environment" echo "dist %{?dist}" -echo "RHEL 8 minor version: %{?rhel_minor_version}" +echo "RHEL 8 minor version: %{rhel_minor_version}" echo "use_bundled_ffi %{?use_bundled_ffi}" echo "use_bundled_python_2 %{?use_bundled_python_2}" echo "use_bundled_python_3 %{?use_bundled_python_3}" @@ -575,7 +571,7 @@ echo "use_bundled_yasm %{?use_bundled_yasm}" %patch224 -p1 -b .1170092 %if 0%{?rhel} == 8 - %if 0%{?rhel_minor_version} >= 3 + %if %{rhel_minor_version} >= 3 # fixing /usr/include in the patch for the flatpak build %if 0%{?flatpak} sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch @@ -1516,8 +1512,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Jun 29 2021 CentOS Sources - 78.11.0-1.el8.centos -- Apply debranding changes +* Fri Jul 16 2021 Jan Horak - 78.12.0-3 +- Rebuild to pickup older nss + +* 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 * Mon May 31 2021 Eike Rathke - 78.11.0-1 - Update to 78.11.0 build1