Manual CentOS Debranding thunderbird-60.7.0-1.el8_0

SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch

+diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
+--- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
++++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
+@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
++  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
+ }
+ 
+ #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)

SOURCES/thunderbird-redhat-default-prefs.js.rhel6 → SOURCES/thunderbird-centos-default-prefs.js.el6

@@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "CentOS");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);

SOURCES/thunderbird-redhat-default-prefs.js.rhel7 → SOURCES/thunderbird-centos-default-prefs.js.el7

@@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "CentOS");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);

SPECS/thunderbird.spec

@@ -129,8 +129,8 @@ Source205:      gtk3-private-%{gtk3_nvr}-setup-flags-env.inc
 Source206:      gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc
 Source301:      yasm-1.2.0-3.el5.src.rpm
 Source303:      libffi-3.0.13-18.el7_3.src.rpm
-Source601:      thunderbird-redhat-default-prefs.js.rhel6
-Source701:      thunderbird-redhat-default-prefs.js.rhel7
+Source601:      thunderbird-centos-default-prefs.js.el6
+Source701:      thunderbird-centos-default-prefs.js.el7
 #Python 2.7
 Source100:      https://www.python.org/ftp/python/%{bundled_python_version}/Python-%{bundled_python_version}.tar.xz
 
@@ -167,6 +167,8 @@ Patch406:        mozilla-256180.patch
 Patch413:        mozilla-1353817.patch
 Patch415:        mozilla-1436242.patch
 Patch416:        mozilla-1460871-ldap-query.patch
+
+Patch1000:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 #Removing this patch would lead to losing user saved credentials in profile!
 
 ## Thunderbird patches
@@ -372,6 +374,10 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %patch26 -p1 -b .icu
 %endif
 
+%ifarch %{arm}
+%patch1000 -p1 -b .mozilla-1238661
+%endif
+
 # Thunderbird patches
 
 %{__rm} -f .mozconfig
@@ -716,8 +722,12 @@ export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 #export MOZ_SERVICES_SYNC="1"
 export STRIP=/bin/true
 %if 0%{?rhel} == 8
+%ifarch %{arm}
+export LLVM_CONFIG=/usr/bin/llvm-config-32
+%else 
 export LLVM_CONFIG=/usr/bin/llvm-config-64
 %endif
+%endif
 ./mach build -v
 
 #---------------------------------------------------------------------
@@ -987,6 +997,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Fri Jun 28 2019 Johnny Hughes <johnny@centos.org> - 60.7.0-1
+- Manual CentOS Debranding
+
 * Mon May 27 2019 Martin Stransky <stransky@redhat.com> - 60.7.0-1
 - Update to 60.7.0