From c45ba07eb6caccd7bde1da7ccecfdf337e1e2cd3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mon, 04 Feb 2019 19:27:59 +0000
Subject: [PATCH] debrand thunderbird-60.5.0-1.el7_6

---
 SPECS/thunderbird.spec |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 7055e8e..303b64b 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -27,7 +27,9 @@
 %define use_bundled_python 0
 %endif
 
+%if 0%{?rhel} < 8
 %global use_rustts        1
+%endif
 %global dts_version       7
 %global rst_version       7
 %global llvm_version      7
@@ -89,7 +91,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        60.4.0
+Version:        60.5.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -105,7 +107,7 @@
 # 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}-20190103.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?ext_version}-20190129.tar.xz
 # Locales for lightning
 Source2:        lightning-langpacks-%{version}.tar.xz
 %endif
@@ -148,7 +150,6 @@
 Patch40:        build-aarch64-skia.patch
 Patch41:        build-debug-qcms.patch
 Patch43:        xulrunner-24.0-jemalloc-ppc.patch
-Patch44:        firefox-disable-dbus-remote.patch
 Patch45:        build-disable-elfhack.patch
 
 # Fedora/RHEL specific patches
@@ -233,6 +234,9 @@
 BuildRequires:  rust-toolset-%{rst_version}-rust
 %endif
 %if 0%{?rhel} == 8
+BuildRequires:  llvm >= %{llvm_version}
+BuildRequires:  llvm-devel >= %{llvm_version}
+BuildRequires:  clang >= %{llvm_version}
 BuildRequires:  llvm-toolset-%{llvm_version}
 BuildRequires:  llvm-toolset-%{llvm_version}-llvm-devel
 %endif
@@ -331,10 +335,6 @@
 %patch41 -p1 -b .build-debug-qcms
 %endif
 %patch43 -p1 -b .jemalloc-ppc
-# Disable DBus remote on RHEL6 as it does not build here.
-%if 0%{?rhel} == 6
-%patch44 -p1 -b .disable-dbus-remote
-%endif
 %if 0%{?rhel} == 8
 %patch45 -p1 -b .elfhack
 %endif
@@ -346,7 +346,7 @@
 
 # Fedora patches
 %patch215 -p1 -b .addons
-%patch219 -p2 -b .rhbz-1173156
+%patch219 -p1 -b .rhbz-1173156
 %patch224 -p1 -b .1170092
 %patch225 -p1 -b .1005640-accept-lang
 
@@ -715,6 +715,9 @@
 export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 #export MOZ_SERVICES_SYNC="1"
 export STRIP=/bin/true
+%if 0%{?rhel} == 8
+export LLVM_CONFIG=/usr/bin/llvm-config-64
+%endif
 ./mach build -v
 
 #---------------------------------------------------------------------
@@ -944,6 +947,7 @@
 %{mozappdir}/platform.ini
 %{mozappdir}/application.ini
 %{mozappdir}/blocklist.xml
+%{mozappdir}/features/*.xpi
 %exclude %{mozappdir}/removed-files
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
 %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
@@ -983,6 +987,9 @@
 #===============================================================================
 
 %changelog
+* Tue Jan 29 2019 Martin Stransky <stransky@redhat.com> - 60.5.0-1
+- Update to 60.5.0
+
 * Thu Jan  3 2019 Jan Horak <jhorak@redhat.com> - 60.4.0-1
 - Update to 60.4.0
 

--
Gitblit v1.8.0