From 9e2616bb3f28eecba5f25e11799ac2518f2eab8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
Date: Thu, 14 Nov 2019 13:50:00 +0100
Subject: [PATCH] s390x fails on: os.unlink(f.name) in icu build, try to ignore
 that

---
 mozjs68.spec                       |  7 +++++++
 s390x_icu_ignore_unlink_fail.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 s390x_icu_ignore_unlink_fail.patch

diff --git a/mozjs68.spec b/mozjs68.spec
index 66f3951..7d52a08 100644
--- a/mozjs68.spec
+++ b/mozjs68.spec
@@ -42,6 +42,7 @@ Patch13:        emitter_test.patch
 Patch14:        init_patch.patch
 # TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
 Patch15:        spidermonkey_checks_disable.patch
+Patch16:        s390x_icu_ignore_unlink_fail.patch
 
 # Patches from Fedora firefox package:
 Patch26:        build-icu-big-endian.patch
@@ -98,6 +99,12 @@ pushd ../..
 %patch14 -p1
 %patch15 -p1
 
+# Something weird going on in icu build, try to ignore error when removing file
+# FIXME
+%ifarch s390x
+%patch16 -p1
+%endif
+
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
diff --git a/s390x_icu_ignore_unlink_fail.patch b/s390x_icu_ignore_unlink_fail.patch
new file mode 100644
index 0000000..399dbc0
--- /dev/null
+++ b/s390x_icu_ignore_unlink_fail.patch
@@ -0,0 +1,12 @@
+--- firefox-68.0/intl/icu_sources_data.py
++++ firefox-68.0/intl/icu_sources_data.py
+@@ -196,7 +196,10 @@
+              file=sys.stderr)
+         return False
+     else:
+-        os.unlink(f.name)
++        try:
++            os.unlink(f.name)
++        except NameError:
++            print('FIXME: intl/icu_sources_data.py: Failed to remove file')
+         return True