From c762861a0f4b07997ff620d30ca1a04142898ef3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mar 06 2015 09:02:08 +0000 Subject: Relax assertion-error dependency --- diff --git a/.gitignore b/.gitignore index 9b4d444..a298ef7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /simple-assert-1.0.0.tgz /simple-assert-tests-1.0.0.tar.bz2 +/simple-assert-ad723ef3c0e8e33ac55f40c0613204a3ff56c689.tar.gz diff --git a/nodejs-simple-assert.spec b/nodejs-simple-assert.spec index d83b70c..96ea774 100644 --- a/nodejs-simple-assert.spec +++ b/nodejs-simple-assert.spec @@ -1,16 +1,13 @@ +%global commit ad723ef3c0e8e33ac55f40c0613204a3ff56c689 + Name: nodejs-simple-assert Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vanilla assertions for Node.js License: MIT URL: https://github.com/chaijs/simple-assert -Source0: http://registry.npmjs.org/simple-assert/-/simple-assert-%{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: simple-assert-tests-%{version}.tar.bz2 -Source10: simple-assert-dl-tests.sh +Source0: https://github.com/chaijs/simple-assert/archive/%{commit}/simple-assert-%{commit}.tar.gz BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -27,8 +24,8 @@ when testing Chai's dependencies. %prep -%setup -q -n package -%setup -T -D -a 1 -q -n package +%setup -q -n simple-assert-%{commit} +%nodejs_fixdep assertion-error "^1.0.0" rm -rf node_modules @@ -53,6 +50,10 @@ cp -pr package.json index.js %{buildroot}%{nodejs_sitelib}/simple-assert %changelog +* Fri Mar 6 2015 Tom Hughes - 1.0.0-3 +- Relax assertion-error-dependency +- Switch to using github as source so we get tests + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/simple-assert-dl-tests.sh b/simple-assert-dl-tests.sh deleted file mode 100755 index 35a436e..0000000 --- a/simple-assert-dl-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -tag=1.0.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/chaijs/simple-assert.git -cd simple-assert -git archive --prefix="test/" --format=tar tags/${tag}:test/ \ - | bzip2 > "$pwd"/simple-assert-tests-${tag}.tar.bz2 -popd diff --git a/sources b/sources index 680684d..198f607 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -690fafe18c365ee07008127c2805cb43 simple-assert-1.0.0.tgz -05be07cc1f71663ffadad0fb2d47b467 simple-assert-tests-1.0.0.tar.bz2 +d315514fcdf7ed5a436811f98c7a34fb simple-assert-ad723ef3c0e8e33ac55f40c0613204a3ff56c689.tar.gz