The package rpms/nodejs-shelljs.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-shelljs.git/commit/?id=6f8....
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit 6f8eea6c50d25ee531d7e864c0a1c145cf0e8a9f
Author: Tom Hughes <tom(a)compton.nu>
Date: Thu Nov 28 13:30:10 2019 +0000
Update to 0.8.3 upstream release
diff --git a/.gitignore b/.gitignore
index 9392e92..6eb898b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/tests-v0.3.0.tar.bz2
/shelljs-0.7.3.tgz
/tests-0.7.3.tar.bz2
+/nodejs-shelljs-0.8.3.tar.gz
diff --git a/dl-tests.sh b/dl-tests.sh
deleted file mode 100644
index 8ad8c52..0000000
--- a/dl-tests.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-tag=v0.3.0
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
- set +e
- [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-
-pushd "$tmp"
-git clone
git://github.com/arturadib/shelljs.git
-cd shelljs
-git archive --prefix="test/" --format=tar tags/${tag}:test/ \
- | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-popd
diff --git a/nodejs-shelljs-0.3.0-Do-not-run-jshint-tests.patch
b/nodejs-shelljs-0.3.0-Do-not-run-jshint-tests.patch
deleted file mode 100644
index 0cf45bd..0000000
--- a/nodejs-shelljs-0.3.0-Do-not-run-jshint-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4820ff8188a283ebbd08af127595f04341f43738 Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Thu, 15 May 2014 18:25:46 +0100
-Subject: [PATCH] Do not run jshint tests
-
----
- scripts/run-tests.js | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/scripts/run-tests.js b/scripts/run-tests.js
-index f9d31e0..67c6dd8 100755
---- a/scripts/run-tests.js
-+++ b/scripts/run-tests.js
-@@ -6,26 +6,6 @@ var path = require('path');
- var failed = false;
-
- //
--// Lint
--//
--JSHINT_BIN = './node_modules/jshint/bin/jshint';
--cd(__dirname + '/..');
--
--if (!test('-f', JSHINT_BIN)) {
-- echo('JSHint not found. Run `npm install` in the root dir first.');
-- exit(1);
--}
--
--if (exec(JSHINT_BIN + ' *.js test/*.js').code !== 0) {
-- failed = true;
-- echo('*** JSHINT FAILED! (return code != 0)');
-- echo();
--} else {
-- echo('All JSHint tests passed');
-- echo();
--}
--
--//
- // Unit tests
- //
- cd(__dirname + '/../test');
---
-1.9.0
-
diff --git a/nodejs-shelljs.spec b/nodejs-shelljs.spec
index 9ae0f4a..3b63dd1 100644
--- a/nodejs-shelljs.spec
+++ b/nodejs-shelljs.spec
@@ -1,41 +1,28 @@
%{?nodejs_find_provides_and_requires}
-%global enable_tests 1
+%global enable_tests 0
+
+Name: nodejs-shelljs
+Version: 0.8.3
+Release: 1%{?dist}
+Summary: Portable Unix shell commands for Node.js
-Name: nodejs-shelljs
-Version: 0.7.3
-Release: 6%{?dist}
-Summary: Portable Unix shell commands for Node.js
# The bulk of the project is licensed under BSD license.
# src/cp.js and src/rm.js contain MIT licensed code.
#
https://fedorahosted.org/fpc/ticket/413
-License: BSD and MIT
-URL:
http://github.com/arturadib/shelljs
-Source0:
http://registry.npmjs.org/shelljs/-/shelljs-%{version}.tgz
-# The test files are not included in the npm tarball.
-# Source1 is generated by running Source10, which pulls from the upstream
-# version control repository.
-Source1: tests-%{version}.tar.bz2
-Source10: dl-tests.sh
-
-# The "shjs.js" test file is failing in mock
-# when run from scripts/run-tests.js
-#
-# So, to make a long story short, we'll patch it out of the
-# run-tests.js script
-Patch0: nodejs-shelljs_fix-tests.patch
-
-BuildArch: noarch
-%if 0%{?fedora} >= 19
-ExclusiveArch: %{nodejs_arches} noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
-%endif
+License: BSD and MIT
+URL:
http://github.com/arturadib/shelljs
+Source0:
http://github.com/arturadib/shelljs/archive/v%{version}/%{name}-%{version...
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
BuildRequires: nodejs-packaging
+
+BuildRequires: npm(glob)
+
%if 0%{?enable_tests}
BuildRequires: coffee-script
-BuildRequires: npm(glob)
+BuildRequires: npm(ava)
%endif
%description
@@ -43,30 +30,25 @@ BuildRequires: npm(glob)
%prep
-%setup -q -n package
-%setup -q -T -D -a 1 -n package
-%patch0 -p1
-
+%autosetup -p 1 -n shelljs-%{version}
sed -i '1s/env //' bin/shjs
-
%nodejs_fixdep glob
+
%build
#nothing to do
%install
mkdir -p %{buildroot}%{nodejs_sitelib}/shelljs
-cp -pr package.json global.js make.js shell.js src/ \
+cp -pr package.json commands.js global.js make.js plugin.js shell.js src/ \
%{buildroot}%{nodejs_sitelib}/shelljs
-
mkdir -p %{buildroot}%{nodejs_sitelib}/shelljs/bin
install -p -m0755 bin/shjs \
%{buildroot}%{nodejs_sitelib}/shelljs/bin
mkdir -p %{buildroot}%{_bindir}
ln -sf %{nodejs_sitelib}/shelljs/bin/shjs \
%{buildroot}%{_bindir}/shjs
-
%nodejs_symlink_deps
@@ -74,21 +56,23 @@ ln -sf %{nodejs_sitelib}/shelljs/bin/shjs \
%nodejs_symlink_deps --check
%{__nodejs} -e 'require("./")'
%if 0%{?enable_tests}
-%__nodejs scripts/run-tests
+ava test/*.js
%else
%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
%endif
%files
-%{!?_licensedir:%global license %doc}
%license LICENSE
-%doc README.md MAINTAINERS
+%doc CHANGELOG.md CONTRIBUTING.md README.md RELEASE.md
%{nodejs_sitelib}/shelljs
%{_bindir}/shjs
%changelog
+* Thu Nov 28 2019 Tom Hughes <tom(a)compton.nu> - 0.8.3-1
+- Update to 0.8.3 upstream release
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.3-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/nodejs-shelljs_fix-tests.patch b/nodejs-shelljs_fix-tests.patch
deleted file mode 100644
index 351ae21..0000000
--- a/nodejs-shelljs_fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/scripts/run-tests.js b/scripts/run-tests.js
-index 1b361da..a0be383 100755
---- a/scripts/run-tests.js
-+++ b/scripts/run-tests.js
-@@ -10,6 +10,7 @@ var failed = false;
- cd(__dirname + '/../test');
- ls('*.js').forEach(function(file) {
- echo('Running test:', file);
-+ if (file === "shjs.js") return;
- if (exec(JSON.stringify(process.execPath)+' '+file).code !== 123) { // 123
avoids false positives (e.g. premature exit)
- failed = true;
- echo('*** TEST FAILED! (missing exit code "123")');
diff --git a/sources b/sources
index eb6b39f..a2ed721 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (shelljs-0.7.3.tgz) =
b3cb3c976df2866d758a6cba715e9e59efd793498061e6a79557a0daea6fdff3b8567a416a2e014efcce29897772ddc8981ffc6195238ff5c523aa603959c157
-SHA512 (tests-0.7.3.tar.bz2) =
26680fd5bbfece22fae8e46087f17d8ab83d7e5ed2bcf8e887d85e025aa64a66ab6623c46519ac9012fced834bd463c830276f51f6fc16290e26465fbe62d378
+SHA512 (nodejs-shelljs-0.8.3.tar.gz) =
9f9e1dab604f1051359a53789c7b0fdc7b4c1d3ee795efa3a26ee69b4be0dc22203486813c4ae894eae08c6e57e46cd53a5355db87ed254131bbeaec56549734