From e29ba1bb2ef6927ad25c3f83ca156d4c729d7971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
Date: Sun, 17 Nov 2019 15:41:13 +0100
Subject: [PATCH] Clean up
 icu_sources_data-Write-command-output-to-our-stderr.patch

I should learn to read before fixing stuff :)
---
 ...es_data-Write-command-output-to-our-stderr.patch |  9 +++++----
 mozjs68.spec                                        | 13 ++++---------
 s390x_icu_ignore_unlink_fail.patch                  | 12 ------------
 3 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 s390x_icu_ignore_unlink_fail.patch

diff --git a/icu_sources_data-Write-command-output-to-our-stderr.patch b/icu_sources_data-Write-command-output-to-our-stderr.patch
index a55b967..e2ed484 100644
--- a/icu_sources_data-Write-command-output-to-our-stderr.patch
+++ b/icu_sources_data-Write-command-output-to-our-stderr.patch
@@ -13,7 +13,7 @@ diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
 index 8cf9290..7d2d983 100644
 --- a/intl/icu_sources_data.py
 +++ b/intl/icu_sources_data.py
-@@ -187,13 +187,11 @@
+@@ -187,16 +187,13 @@
 
  def try_run(name, command, cwd=None, **kwargs):
      try:
@@ -21,13 +21,14 @@ index 8cf9290..7d2d983 100644
 -            subprocess.check_call(command, cwd=cwd, stdout=f,
 -                                  stderr=subprocess.STDOUT, **kwargs)
 +        subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
-+                                 stderr=subprocess.STDOUT, **kwargs)
++                                stderr=subprocess.STDOUT, **kwargs)
      except subprocess.CalledProcessError:
 -        print('''Error running "{}" in directory {}
 -    See output in {}'''.format(' '.join(command), cwd, f.name),
 -              file=sys.stderr)
 +        print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
-+             file=sys.stderr)
++            file=sys.stderr)
          return False
      else:
-         os.unlink(f.name)
+-        os.unlink(f.name)
+         return True
diff --git a/mozjs68.spec b/mozjs68.spec
index 8cd06f4..0fc9fdf 100644
--- a/mozjs68.spec
+++ b/mozjs68.spec
@@ -1,10 +1,5 @@
 %global major 68
 
-# disable armv7 for now... it fails differently on real arm (koji) and emulated (qemu)
-# error[E0463]: can't find crate for `std` - on qemu
-# ERROR: Don't know how to translate armv7hl-redhat-linux-gnu for rustc - on koji
-ExcludeArch: armv7hl
-
 # LTO - Enable in Release builds, but consider disabling for development as it increases compile time
 %global build_with_lto    0
 
@@ -47,7 +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
+Patch16:        rust_armv7.patch
 
 # Patches from Fedora firefox package:
 Patch26:        build-icu-big-endian.patch
@@ -104,9 +99,9 @@ pushd ../..
 %patch14 -p1
 %patch15 -p1
 
-# Something weird going on in icu build, try to ignore error when removing file
-# FIXME
-%ifarch s390x
+# Correct armv7hl rust triple is armv7-unknown-linux-gnueabihf and not armv7-unknown-linux-gnueabi
+# according to rust spec file in Fedora
+%ifarch armv7hl
 %patch16 -p1
 %endif
 
diff --git a/s390x_icu_ignore_unlink_fail.patch b/s390x_icu_ignore_unlink_fail.patch
deleted file mode 100644
index 399dbc0..0000000
--- a/s390x_icu_ignore_unlink_fail.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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