import thunderbird-78.12.0-3.el8_4
This commit is contained in:
CentOS Sources
parent
2e5da96e9f
commit
bdacd8cd91
4
.gitignore
vendored
4
.gitignore
vendored
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
MOZ_ARCH=$(uname -m)
|
||||
case $MOZ_ARCH in
|
||||
x86_64 | s390x | sparc64 )
|
||||
MOZ_LIB_DIR="/usr/lib64"
|
||||
SECONDARY_LIB_DIR="/usr/lib"
|
||||
MOZ_LIB_DIR="%PREFIX%/lib64"
|
||||
SECONDARY_LIB_DIR="%PREFIX%/lib"
|
||||
;;
|
||||
* )
|
||||
MOZ_LIB_DIR="/usr/lib"
|
||||
SECONDARY_LIB_DIR="/usr/lib64"
|
||||
MOZ_LIB_DIR="%PREFIX%/lib"
|
||||
SECONDARY_LIB_DIR="%PREFIX%/lib64"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -45,7 +45,7 @@ MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-4
|
||||
##
|
||||
## Set MOZ_APP_LAUNCHER for gnome-session
|
||||
##
|
||||
export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
|
||||
export MOZ_APP_LAUNCHER="%PREFIX%/bin/thunderbird"
|
||||
|
||||
##
|
||||
## Disable the GNOME crash dialog, Moz has it's own
|
||||
|
||||
@ -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}"
|
||||
@ -573,8 +569,13 @@ echo "use_bundled_yasm %{?use_bundled_yasm}"
|
||||
%patch215 -p1 -b .addons
|
||||
%patch219 -p1 -b .rhbz-1173156
|
||||
%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
|
||||
%endif
|
||||
%patch235 -p1 -b .pipewire-0-3
|
||||
%else
|
||||
%patch231 -p1 -b .pipewire
|
||||
@ -1256,6 +1257,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20}
|
||||
rm -rf %{buildroot}%{_bindir}/thunderbird
|
||||
%{__rm} -rf %{buildroot}%{_bindir}/thunderbird
|
||||
%{__cat} %{SOURCE21} > %{buildroot}%{_bindir}/thunderbird
|
||||
sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{_bindir}/thunderbird
|
||||
%if 0%{?bundle_gtk3}
|
||||
sed -i -e 's|%RHEL_ENV_VARS%|export XDG_DATA_DIRS="$MOZ_LIB_DIR/thunderbird/bundled/share:/usr/share:$XDG_DATA_DIRS"\nexport FONTCONFIG_FILE="$MOZ_LIB_DIR/thunderbird/bundled/etc/fonts/fonts.conf"|' %{buildroot}%{_bindir}/thunderbird
|
||||
%else
|
||||
@ -1346,6 +1348,55 @@ test -f "%{buildroot}%{mozappdir}/distribution/extensions/unicode-width/scripts/
|
||||
# Removing librnp.so - we cannot deliver that in RHELs
|
||||
%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so
|
||||
|
||||
# Register as an application to be visible in the software center
|
||||
#
|
||||
# NOTE: It would be *awesome* if this file was maintained by the upstream
|
||||
# project, translated and installed into the right place during `make install`.
|
||||
#
|
||||
# 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 <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
|
||||
<!--
|
||||
BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071065
|
||||
SentUpstream: 2014-09-22
|
||||
-->
|
||||
<application>
|
||||
<id type="desktop">mozilla-thunderbird.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>MPLv1.1 or GPLv2+ or LGPLv2+</project_license>
|
||||
<description>
|
||||
<p>
|
||||
Thunderbird is an email client that allows you to read, write and organise all
|
||||
of your email messages. It is compatible with most email accounts, including the
|
||||
most popular webmail services.
|
||||
</p>
|
||||
<p>
|
||||
Thunderbird is designed by Mozilla, a global community working together to make
|
||||
the Internet better. Mozilla believe that the Internet should be open, public,
|
||||
and accessible to everyone without any restrictions.
|
||||
</p>
|
||||
<ul>
|
||||
<li>Easier than ever to set up a new e-mail account</li>
|
||||
<li>Awesome search allows you to find your messages fast</li>
|
||||
<li>Thousands of add-ons give you the freedom to make Thunderbird your own</li>
|
||||
</ul>
|
||||
</description>
|
||||
<url type="homepage">http://www.mozilla.org/thunderbird/</url>
|
||||
<screenshots>
|
||||
<screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png</screenshot>
|
||||
</screenshots>
|
||||
<releases>
|
||||
<release version="%{version}" date="$(date '+%F')"/>
|
||||
</releases>
|
||||
<!-- FIXME: change this to an upstream email address for spec updates
|
||||
<updatecontact>someone_who_cares@upstream_project.org</updatecontact>
|
||||
-->
|
||||
</application>
|
||||
EOF
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%clean
|
||||
@ -1394,6 +1445,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%attr(755,root,root) %{_bindir}/thunderbird
|
||||
%{_datadir}/appdata/*.appdata.xml
|
||||
%attr(644,root,root) %{_datadir}/applications/thunderbird.desktop
|
||||
%dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id}
|
||||
%dir %{_libdir}/mozilla/extensions/%{thunderbird_app_id}
|
||||
@ -1460,6 +1512,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Fri Jul 16 2021 Jan Horak <jhorak@redhat.com> - 78.12.0-3
|
||||
- Rebuild to pickup older nss
|
||||
|
||||
* Mon Jul 12 2021 Eike Rathke <erack@redhat.com> - 78.12.0-2
|
||||
- Update to 78.12.0 build2
|
||||
|
||||
* Thu Jul 08 2021 Eike Rathke <erack@redhat.com> - 78.12.0-1
|
||||
- Update to 78.12.0 build1
|
||||
|
||||
* Mon May 31 2021 Eike Rathke <erack@redhat.com> - 78.11.0-1
|
||||
- Update to 78.11.0 build1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user