The package rpms/nodejs-merge-descriptors.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/nodejs-merge-descriptors.git/comm....
Change:
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
Thanks.
Full change:
============
commit 887031c930e7f3462cbaa5888d557e6e2991f405
Author: Tom Hughes <tom(a)compton.nu>
Date: Fri Jul 20 19:20:14 2018 +0100
Add upstream patch for Node 10.x support
diff --git a/nodejs-merge-descriptors-node10.patch
b/nodejs-merge-descriptors-node10.patch
new file mode 100644
index 0000000..88197b0
--- /dev/null
+++ b/nodejs-merge-descriptors-node10.patch
@@ -0,0 +1,39 @@
+From 4512270990987bb387ac64cd9bf323d1c5f7f361 Mon Sep 17 00:00:00 2001
+From: Douglas Christopher Wilson <doug(a)somethingdoug.com>
+Date: Sun, 1 Jul 2018 23:50:02 -0400
+Subject: [PATCH] tests: fix throw asserts
+
+---
+ test/merge.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/merge.js b/test/merge.js
+index 80cbdc8..3a1d677 100644
+--- a/test/merge.js
++++ b/test/merge.js
+@@ -16,21 +16,21 @@ describe('merge(dest, src)', function () {
+ describe('arguments', function () {
+ describe('dest', function () {
+ it('should be required', function () {
+- assert.throws(merge.bind(null, undefined), 'argument dest is required')
++ assert.throws(merge.bind(null, undefined), /argument dest is required/)
+ })
+
+ it('should reject null', function () {
+- assert.throws(merge.bind(null, null), 'argument dest is required')
++ assert.throws(merge.bind(null, null), /argument dest is required/)
+ })
+ })
+
+ describe('src', function () {
+ it('should be required', function () {
+- assert.throws(merge.bind(null, {}, undefined), 'argument src is
required')
++ assert.throws(merge.bind(null, {}, undefined), /argument src is required/)
+ })
+
+ it('should reject null', function () {
+- assert.throws(merge.bind(null, {}, null), 'argument dest is required')
++ assert.throws(merge.bind(null, {}, null), /argument src is required/)
+ })
+ })
+ })
diff --git a/nodejs-merge-descriptors.spec b/nodejs-merge-descriptors.spec
index 8af88e8..4eba386 100644
--- a/nodejs-merge-descriptors.spec
+++ b/nodejs-merge-descriptors.spec
@@ -4,17 +4,14 @@ Name: nodejs-merge-descriptors
Version: 1.0.1
Release: 6%{?dist}
Summary: A Node.js module to merge objects using descriptors
+
License: MIT
-Group: System Environment/Libraries
URL:
https://github.com/component/merge-descriptors
Source0:
https://github.com/component/merge-descriptors/archive/%{version}/merge-d...
+#
https://github.com/component/merge-descriptors/commit/4512270990987bb387a...
+Patch0: nodejs-merge-descriptors-node10.patch
BuildArch: noarch
-
-%if 0%{?fedora} >= 19
ExclusiveArch: %{nodejs_arches} noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
-%endif
BuildRequires: nodejs-packaging
@@ -25,7 +22,7 @@ BuildRequires: npm(mocha)
%prep
-%setup -q -n merge-descriptors-%{version}
+%autosetup -p 1 -n merge-descriptors-%{version}
%build