From 9481f6c9cf307c2327e10dc0055452872030a971 Mon Sep 17 00:00:00 2001 From: Jared K. Smith Date: Jul 24 2016 13:10:47 +0000 Subject: Update to upstream 1.4.1 release --- diff --git a/dl-tests.sh b/dl-tests.sh index bfe8e6d..9ccbc43 100644 --- a/dl-tests.sh +++ b/dl-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -tag=v1.0.1 +tag=v1.4.1 set -e diff --git a/nodejs-q.spec b/nodejs-q.spec index 974fde8..d54104d 100644 --- a/nodejs-q.spec +++ b/nodejs-q.spec @@ -1,19 +1,20 @@ %{?nodejs_find_provides_and_requires} -%global enable_tests 0 +%global enable_tests 1 Name: nodejs-q -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: A tool for making and composing asynchronous promises in JavaScript # q.js appears to contain both MIT and ASL 2.0 licensed code License: MIT and ASL 2.0 Group: System Environment/Libraries URL: https://github.com/kriskowal/q Source0: http://registry.npmjs.org/q/-/q-%{version}.tgz -# Source1 is generated by running Source10, which pulls from the upstream +# Sources 1-2 are generated by running Source10, which pulls from the upstream # revision control repository. -Source1: tests-v%{version}.tar.bz2 +Source1: tests-%{version}.tar.bz2 +Source2: examples-%{version}.tar.bz2 Source10: dl-tests.sh BuildArch: noarch @@ -27,8 +28,7 @@ BuildRequires: nodejs-packaging %if 0%{?enable_tests} BuildRequires: npm(jasmine-node) -# Not yet packaged for Fedora. -# BuildRequires: npm(promises-aplus-tests) +BuildRequires: npm(promises-aplus-tests) %endif %description @@ -47,6 +47,7 @@ everything from file system/database access or RPC to templating. %prep %setup -q -n package %setup -q -D -T -a 1 -n package +%setup -q -D -T -a 2 -n package %build @@ -55,27 +56,33 @@ everything from file system/database access or RPC to templating. %install mkdir -p %{buildroot}%{nodejs_sitelib}/q -cp -pr package.json q.js queue.js \ +cp -pr package.json *.js \ %{buildroot}%{nodejs_sitelib}/q %nodejs_symlink_deps -%if 0%{?enable_tests} %check %nodejs_symlink_deps --check -# /usr/bin/npm install promises-aplus-tests@1.x -%{nodejs_sitelib}/jasmine-node/bin/jasmine-node spec -./node_modules/promises-aplus-tests/lib/cli.js \ - spec/aplus-adapter +%{__nodejs} -e 'require("./")' +%if 0%{?enable_tests} +%{_bindir}/jasmine-node spec +#%{_bindir}/promises-aplus-tests spec/aplus-adapter +%else +%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m" %endif %files -%doc CONTRIBUTING.md LICENSE README.md +%{!?_licensedir:%global license %doc} +%doc *.md examples/ +%license LICENSE %{nodejs_sitelib}/q %changelog +* Sun Jul 24 2016 Jared Smith - 1.4.1-1 +- Update to upstream 1.4.1 release + * Thu Feb 04 2016 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild