From 45a7eae203034f1d51e1cc0a1544b033709c26e0 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Mar 15 2014 10:02:48 +0000 Subject: Update to upstream release 2.1.0 --- diff --git a/.gitignore b/.gitignore index 4981721..f60290f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /tests-1.1.1.tar.bz2 /commander-1.2.0.tgz /tests-1.2.0.tar.bz2 +/nodejs-commander-2.1.0.tar.gz diff --git a/dl-tests.sh b/dl-tests.sh deleted file mode 100644 index 2ad3834..0000000 --- a/dl-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -tag=1.2.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/visionmedia/commander.js.git -cd commander.js -git archive --prefix="test/" --format=tar tags/${tag}:test/ \ - | bzip2 > "$pwd"/tests-${tag}.tar.bz2 -popd diff --git a/nodejs-commander-1.1.1-deps.patch b/nodejs-commander-1.1.1-deps.patch deleted file mode 100644 index 921f99e..0000000 --- a/nodejs-commander-1.1.1-deps.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur a/package.json b/package.json ---- a/package.json -+++ b/package.json -@@ -9,5 +9,5 @@ - , "devDependencies": { "should": ">= 0.0.1" } - , "scripts": { "test": "make test" } - , "main": "index" -- , "engines": { "node": ">= 0.6.x" } -+ , "engines": { "node": ">= 0.6.0" } - } diff --git a/nodejs-commander-2.1.0-Fix-engine-dep.patch b/nodejs-commander-2.1.0-Fix-engine-dep.patch new file mode 100644 index 0000000..f21ff85 --- /dev/null +++ b/nodejs-commander-2.1.0-Fix-engine-dep.patch @@ -0,0 +1,24 @@ +From 8d088f10501bde48a120b20e7ed3b1ca4fd0ddf2 Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Sun, 2 Mar 2014 11:50:57 +0000 +Subject: [PATCH] Fix Node engine dependency + +--- + package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/package.json b/package.json +index af7378e..1253730 100644 +--- a/package.json ++++ b/package.json +@@ -8,6 +8,6 @@ + , "devDependencies": { "should": ">= 0.0.1" } + , "scripts": { "test": "make test" } + , "main": "index" +- , "engines": { "node": ">= 0.6.x" } ++ , "engines": { "node": ">= 0.6.0" } + , "files": ["index.js"] + } +-- +1.8.5.3 + diff --git a/nodejs-commander.spec b/nodejs-commander.spec index 8d4683d..7f253d4 100644 --- a/nodejs-commander.spec +++ b/nodejs-commander.spec @@ -1,21 +1,19 @@ %{?nodejs_find_provides_and_requires} +%global commit 963458a078b727ba52ec9819e13a6d6cce0eab1f + %global enable_tests 1 Name: nodejs-commander -Version: 1.2.0 -Release: 6%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Node.js command-line interfaces made easy # License text is included in Readme.md License: MIT Group: System Environment/Libraries URL: https://github.com/visionmedia/commander.js -Source0: http://registry.npmjs.org/commander/-/commander-%{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 +# Use GitHub as the NPM tarball is missing test/, examples/, History.md. +Source0: https://github.com/visionmedia/commander.js/archive/%{commit}/%{name}-%{version}.tar.gz BuildArch: noarch %if 0%{?fedora} >= 19 @@ -25,7 +23,7 @@ ExclusiveArch: %{ix86} x86_64 %{arm} noarch %endif # Dep generator bug which adds a trailing dot in the nodejs(engine) requires. -Patch0: nodejs-commander-1.1.1-deps.patch +Patch0: %{name}-2.1.0-Fix-engine-dep.patch BuildRequires: nodejs-packaging @@ -40,10 +38,8 @@ inspired by Ruby's commander. %prep -%setup -q -n package -%setup -T -D -a 1 -q -n package +%setup -q -n commander.js-%{commit} %patch0 -p1 -%nodejs_fixdep keypress '0.2.x' %build @@ -66,11 +62,14 @@ find test/test.*.js -exec ./test/run '{}' \; %files -%doc History.md Readme.md +%doc History.md Readme.md examples/ %{nodejs_sitelib}/commander %changelog +* Sun Mar 02 2014 Jamie Nguyen - 2.1.0-1 +- update to upstream release 2.1.0 + * Thu Aug 29 2013 Jamie Nguyen - 1.2.0-6 - fix version of dependency on nodejs-keypress again diff --git a/sources b/sources index 6b41132..27cdcc1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f34736c0dae8d789cbb7e03093d457ae commander-1.2.0.tgz -19216541c39807ed708a65607e4351d3 tests-1.2.0.tar.bz2 +5b212ad4e41f8a6b26cc0c8eb41b99e3 nodejs-commander-2.1.0.tar.gz