diff --git a/.gitignore b/.gitignore index b02e6ba..ace696c 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.14.0.source.tar.xz +SOURCES/thunderbird-langpacks-78.14.0-20210902.tar.xz SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.thunderbird.metadata b/.thunderbird.metadata index bfbc2d9..a37c802 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 +b97328411de982fce06ce23a22f3d1a248980c48 SOURCES/thunderbird-78.14.0.source.tar.xz +5958b41e21255bf2a65cef151d9ec3bd33d95be7 SOURCES/thunderbird-langpacks-78.14.0-20210902.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 5647ecf..2e3bdd0 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: 3%{?dist} +Version: 78.14.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}-20210902.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. @@ -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} @@ -1355,8 +1364,8 @@ test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/ # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mozilla-thunderbird.appdata.xml < %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml <