From 589dba81168d1b2d9adb9f81b9df8864357576d3 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Oct 31 2017 10:27:31 +0000
Subject: Various secondary arch fixes


---

diff --git a/mozjs52.spec b/mozjs52.spec
index 117f553..1e3b62a 100644
--- a/mozjs52.spec
+++ b/mozjs52.spec
@@ -1,13 +1,13 @@
 %global major 52
 
 # Big endian platforms
-%ifarch ppc64 s390x
+%ifarch ppc ppc64 s390 s390x
 %define big_endian 1
 %endif
 
 Name:           mozjs%{major}
 Version:        52.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SpiderMonkey JavaScript library
 
 License:        MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2.1 and LGPLv2.1+ and AFL and ASL 2.0
@@ -26,7 +26,6 @@ Patch0104:      include-configure-script.patch
 # Patches from Fedora firefox package:
 Patch18:        xulrunner-24.0-jemalloc-ppc.patch
 Patch19:        xulrunner-24.0-s390-inlines.patch
-Patch25:        rhbz-1219542-s390-build.patch
 Patch26:        build-icu-big-endian.patch
 Patch36:        build-missing-xlocale-h.patch
 Patch304:       mozilla-1253216.patch
@@ -68,9 +67,6 @@ pushd ../..
 
 %patch18 -p1 -b .jemalloc-ppc
 %patch19 -p2 -b .s390-inlines
-%ifarch s390
-%patch25 -p1 -b .rhbz-1219542-s390
-%endif
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
@@ -165,6 +161,9 @@ jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic
 %{_includedir}/mozjs-%{major}/
 
 %changelog
+* Tue Oct 31 2017 Kalev Lember <klember@redhat.com> - 52.4.0-2
+- Various secondary arch fixes
+
 * Thu Sep 28 2017 Kalev Lember <klember@redhat.com> - 52.4.0-1
 - Update to 52.4.0
 
diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch
deleted file mode 100644
index 3734ce5..0000000
--- a/rhbz-1219542-s390-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390 firefox-43.0.3/js/src/configure.in
---- firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390	2015-12-23 17:11:01.000000000 -0500
-+++ firefox-43.0.3/js/src/configure.in	2016-01-03 08:08:27.139956990 -0500
-@@ -1466,7 +1466,7 @@ case "$host" in
- 
- *-linux*|*-kfreebsd*-gnu|*-gnu*)
-     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
--    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
-     ;;
- 
- *)
-@@ -1649,8 +1649,8 @@ ia64*-hpux*)
-         # while; Intel recommends against using it.
-         MOZ_OPTIMIZE_FLAGS="-O2"
-     elif test "$GNU_CC" -o "$GNU_CXX"; then
--        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
--        MOZ_OPTIMIZE_FLAGS="-O3"
-+        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
-+        MOZ_OPTIMIZE_FLAGS="-O1"
-         if test -z "$CLANG_CC"; then
-            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
-         fi