diff --git a/.gitignore b/.gitignore index b02e6ba..cefc2dd 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.12.0.source.tar.xz -SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz +SOURCES/thunderbird-78.13.0.source.tar.xz +SOURCES/thunderbird-langpacks-78.13.0-20210804.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index bfbc2d9..8e95808 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 -98228bff32bf6cb7e0e34eb135a800d3200881c1 SOURCES/thunderbird-78.12.0.source.tar.xz -a331ca78bb12b64578021ededef270d98a5762a5 SOURCES/thunderbird-langpacks-78.12.0-20210712.tar.xz +2c397d21074cfebdb5519c123533eaaf2a3e3dbc SOURCES/thunderbird-78.13.0.source.tar.xz +2b876b8ec02f0425896fdcb8457194f7d0862ac7 SOURCES/thunderbird-langpacks-78.13.0-20210804.tar.xz 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index ffd684a..fb8d3dc 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -136,10 +136,10 @@ end} %global nspr_version 4.25 # NSS/NSPR quite often ends in build override, so as requirement the version # we're building against could bring us some broken dependencies from time to time. -#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) +#%%global nspr_build_version %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) %global nspr_build_version %{nspr_version} %global nss_version 3.53.1 -#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) +#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %global nss_build_version %{nss_version} %endif @@ -187,14 +187,15 @@ end} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/distribution/extensions %global tarballdir %{name}-%{version} +%global mozappfeatures %{mozappdir}/features/*.xpi #global pre_tag alpha %global official_branding 1 %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.12.0 -Release: 2%{?dist} +Version: 78.13.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -206,10 +207,10 @@ ExcludeArch: s390 ppc ExclusiveArch: i686 x86_64 ppc64 s390x %endif -# From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source +# 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}-20210712.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210804.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz @@ -521,8 +522,8 @@ Obsoletes: thunderbird-lightning # Override internal dependency generator to avoid showing libraries provided by this package # in dependencies: #AutoProv: 0 -#%define _use_internal_dependency_generator 0 -#%define __find_requires %{SOURCE101} +#%%define _use_internal_dependency_generator 0 +#%%define __find_requires %{SOURCE101} %description Mozilla Thunderbird is a standalone mail and newsgroup client. @@ -583,7 +584,7 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch %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 @@ -1321,6 +1322,14 @@ echo "Adding following langpacks:" cat %{name}.lang %endif +# Install feature extensions. +echo > %{name}.features +if [ -f "$(ls -1 %{mozappfeatures} | head -1)" ]; then + ls -1 %{mozappfeatures} >> %{name}.features + echo "Adding following features:" + cat %{name}.features +fi + # Get rid of devel package and its debugsymbols %{__rm} -rf %{buildroot}%{_libdir}/%{name}-devel-%{version} @@ -1346,7 +1355,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 # @@ -1442,7 +1451,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif #=============================================================================== -%files -f %{name}.lang +%files -f %{name}.lang -f %{name}.features %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird %{_datadir}/appdata/*.appdata.xml @@ -1466,7 +1475,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/*.so %{mozappdir}/platform.ini %{mozappdir}/application.ini -%{mozappdir}/features/*.xpi %exclude %{mozappdir}/removed-files %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png @@ -1481,7 +1489,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/fonts/TwemojiMozilla.ttf %if !%{?system_libicu} -#%{mozappdir}/icudt*.dat +#%%{mozappdir}/icudt*.dat %endif %if !%{?system_nss} %exclude %{mozappdir}/libnssckbi.so @@ -1512,6 +1520,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Aug 04 2021 Eike Rathke - 78.13.0-1 +- Update to 78.13.0 build1 + +* 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