The package rpms/mozjs52.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mozjs52.git/commit/?id=589dba8116....
Change:
-%ifarch s390
Thanks.
Full change:
============
commit 7f41c5a884f0fc6f3cd6a48b6f806e77239a3384
Author: Kalev Lember <klember(a)redhat.com>
Date: Tue Nov 14 12:00:22 2017 +0100
Update to 52.5.0
diff --git a/.gitignore b/.gitignore
index bb1dfc5..cf1570b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/firefox-52.3.0esr.source.tar.xz
/firefox-52.4.0esr.source.tar.xz
+/firefox-52.5.0esr.source.tar.xz
diff --git a/mozjs52.spec b/mozjs52.spec
index a2447fc..a828c3b 100644
--- a/mozjs52.spec
+++ b/mozjs52.spec
@@ -6,8 +6,8 @@
%endif
Name: mozjs%{major}
-Version: 52.4.0
-Release: 3%{?dist}
+Version: 52.5.0
+Release: 1%{?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
@@ -20,7 +20,6 @@ Patch0002: copy-headers.patch
# Patches from
https://github.com/ptomato/mozjs / Debian mozjs52_52.3.1-4.debian.tar.xz
Patch0101: disable-mozglue.patch
-Patch0103: tests-skip-on-all-64-bit-archs.patch
Patch0104: include-configure-script.patch
# Patches from Fedora firefox package:
@@ -62,7 +61,6 @@ pushd ../..
%patch0002 -p1
%patch0101 -p1
-%patch0103 -p1
%patch0104 -p1
%patch18 -p1 -b .jemalloc-ppc
@@ -162,6 +160,9 @@ jit-test/jit_test.py -s -t 1800 --no-progress
../../js/src/js/src/shell/js basic
%{_includedir}/mozjs-%{major}/
%changelog
+* Tue Nov 14 2017 Kalev Lember <klember(a)redhat.com> - 52.5.0-1
+- Update to 52.5.0
+
* Tue Oct 31 2017 Kalev Lember <klember(a)redhat.com> - 52.4.0-3
- Include standalone /usr/bin/js52 interpreter
diff --git a/sources b/sources
index 3e50271..5b10490 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (firefox-52.4.0esr.source.tar.xz) =
be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183
+SHA512 (firefox-52.5.0esr.source.tar.xz) =
fe724108ba538e590b87a5c1b817471d3cca9b038ba2755642e4d7b8ebb6174322be1fe074f24ef181946f9a027106b50b500d2fa541d8a99ef44905822eda18
diff --git a/tests-skip-on-all-64-bit-archs.patch b/tests-skip-on-all-64-bit-archs.patch
deleted file mode 100644
index 8630b54..0000000
--- a/tests-skip-on-all-64-bit-archs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8e7f8d3c651028a2fd1e6e8eb8960f2ca0d3e266 Mon Sep 17 00:00:00 2001
-From: Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com>
-Date: Wed, 5 Jul 2017 21:05:27 -0700
-Subject: [PATCH] tests: Skip on all 64-bit archs
-
-Tests that are skipped on x86_64 should be skipped on all 64-bit
-architectures.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1357593
-
-Taken from Fedora:
-http://pkgs.fedoraproject.org/cgit/rpms/mozjs38.git/tree/fix-64bit-archs.patch
----
- js/src/tests/js1_5/Array/regress-157652.js | 2 +-
- js/src/tests/js1_5/Array/regress-330812.js | 2 +-
- js/src/tests/js1_5/Regress/regress-422348.js | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/js/src/tests/js1_5/Array/regress-157652.js
b/js/src/tests/js1_5/Array/regress-157652.js
-index 0bdba8fd..9d77802c 100644
---- a/js/src/tests/js1_5/Array/regress-157652.js
-+++ b/js/src/tests/js1_5/Array/regress-157652.js
-@@ -1,4 +1,4 @@
--// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) -- No test results
-+// |reftest|
skip-if(xulRuntime.XPCOMABI.match(/x86_64|aarch64|ppc64|ppc64le|s390x/)||Android) -- No
test results
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
-diff --git a/js/src/tests/js1_5/Array/regress-330812.js
b/js/src/tests/js1_5/Array/regress-330812.js
-index 3a392976..c48f4c88 100644
---- a/js/src/tests/js1_5/Array/regress-330812.js
-+++ b/js/src/tests/js1_5/Array/regress-330812.js
-@@ -1,4 +1,4 @@
--// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) -- No test results
-+// |reftest|
skip-if(xulRuntime.XPCOMABI.match(/x86_64|aarch64|ppc64|ppc64le|s390x/)||Android) -- No
test results
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
-diff --git a/js/src/tests/js1_5/Regress/regress-422348.js
b/js/src/tests/js1_5/Regress/regress-422348.js
-index f2443c28..7ae83f4a 100644
---- a/js/src/tests/js1_5/Regress/regress-422348.js
-+++ b/js/src/tests/js1_5/Regress/regress-422348.js
-@@ -1,4 +1,4 @@
--// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)) -- On 64-bit, takes forever
rather than throwing
-+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64|aarch64|ppc64|ppc64le|s390x/)) --
On 64-bit, takes forever rather than throwing
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
-
commit c4fc1def71db27794eaeb67ee45dc2473a752646
Author: Kalev Lember <klember(a)redhat.com>
Date: Tue Oct 31 16:52:36 2017 +0100
Include standalone /usr/bin/js52 interpreter
Polari and gnome-shell are going to make use of it to syntax check js
files in CI. This puts it in the -devel subpackage, in line with how
Debian is packaging /usr/bin/js52 in their -dev subpackage.
diff --git a/mozjs52.spec b/mozjs52.spec
index 1e3b62a..a2447fc 100644
--- a/mozjs52.spec
+++ b/mozjs52.spec
@@ -7,7 +7,7 @@
Name: mozjs%{major}
Version: 52.4.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -123,8 +123,8 @@ popd
# Fix permissions
chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
-# We only need the shared library
-rm %{buildroot}%{_bindir}/js*
+# Remove unneeded files
+rm %{buildroot}%{_bindir}/js52-config
rm %{buildroot}%{_libdir}/libjs_static.ajs
# Rename library and create symlinks, following fix-soname.patch
@@ -156,11 +156,15 @@ jit-test/jit_test.py -s -t 1800 --no-progress
../../js/src/js/src/shell/js basic
%{_libdir}/libmozjs-%{major}.so.0*
%files devel
+%{_bindir}/js52
%{_libdir}/libmozjs-%{major}.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/mozjs-%{major}/
%changelog
+* Tue Oct 31 2017 Kalev Lember <klember(a)redhat.com> - 52.4.0-3
+- Include standalone /usr/bin/js52 interpreter
+
* Tue Oct 31 2017 Kalev Lember <klember(a)redhat.com> - 52.4.0-2
- Various secondary arch fixes
commit 589dba81168d1b2d9adb9f81b9df8864357576d3
Author: Kalev Lember <klember(a)redhat.com>
Date: Tue Oct 31 11:27:31 2017 +0100
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(a)redhat.com> - 52.4.0-2
+- Various secondary arch fixes
+
* Thu Sep 28 2017 Kalev Lember <klember(a)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