diff --git a/.gitignore b/.gitignore index 47ea671..f50f0bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xml2js-tests-0.4.0.tar.bz2 /xml2js-0.4.1.tgz /xml2js-tests-0.4.1.tar.bz2 +/node-xml2js-9b6459903f3e3aa5a821729b8b79836d1d2b84cc.tar.gz diff --git a/nodejs-xml2js.spec b/nodejs-xml2js.spec index 61cd5a4..df303ff 100644 --- a/nodejs-xml2js.spec +++ b/nodejs-xml2js.spec @@ -1,16 +1,13 @@ +%global commit 9b6459903f3e3aa5a821729b8b79836d1d2b84cc + Name: nodejs-xml2js -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: Simple XML to JavaScript object converter License: MIT URL: https://github.com/Leonidas-from-XIV/node-xml2js -Source0: http://registry.npmjs.org/xml2js/-/xml2js-%{version}.tgz -# The test files are not included in the npm tarball. -# Source1 is generated using Source10, which pulls from the upstream -# version control repository. -Source1: xml2js-tests-%{version}.tar.bz2 -Source10: xml2js-dl-tests.sh +Source0: https://github.com/Leonidas-from-XIV/node-xml2js/archive/%{commit}/node-xml2js-%{commit}.tar.gz BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -30,8 +27,7 @@ reason? Then xml2js is what you're looking for! %prep -%setup -q -n package -%setup -T -D -a 1 -q -n package +%setup -q -n node-xml2js-%{commit} %nodejs_fixdep sax "~0.5.2" rm -rf node_modules @@ -56,6 +52,10 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitelib}/xml2js %changelog +* Sun Mar 30 2014 Tom Hughes - 0.4.2-1 +- Update to 0.4.2 upstream release +- Switch to using github as source so we get tests + * Fri Jan 3 2014 Tom Hughes - 0.4.1-1 - Update to 0.4.1 upstream release diff --git a/sources b/sources index 3716c29..1730421 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4cdc0c21cceee96e6940bfe221359ad3 xml2js-0.4.1.tgz -a0e23f6009372a0e31a6f6ed81f6e8aa xml2js-tests-0.4.1.tar.bz2 +1fa56555396040019c58ab7432578ee2 node-xml2js-9b6459903f3e3aa5a821729b8b79836d1d2b84cc.tar.gz diff --git a/xml2js-dl-tests.sh b/xml2js-dl-tests.sh deleted file mode 100755 index b645918..0000000 --- a/xml2js-dl-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -tag=0.4.1 - -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/Leonidas-from-XIV/node-xml2js.git -cd node-xml2js -git archive --prefix="test/" --format=tar tags/${tag}:test/ \ - | bzip2 > "$pwd"/xml2js-tests-${tag}.tar.bz2 -popd