diff --git a/.gitignore b/.gitignore index 746d642..de678d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /dateformat-1.0.6-1.2.3.tgz /dateformat-1.0.12.tgz /nodejs-dateformat-2.0.0.tar.gz +/dateformat-3.0.3.tgz +/tests-3.0.3.tar.bz2 diff --git a/dl-tests.sh b/dl-tests.sh new file mode 100644 index 0000000..36f13ab --- /dev/null +++ b/dl-tests.sh @@ -0,0 +1,131 @@ +#!/bin/bash + +tag=$(sed -n 's/^Version:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') +url=$(sed -n 's/^URL:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') +pkgdir=$(basename $url | sed -s 's/\.git$//') + +echo "tag: $tag" +echo "URL: $url" +echo "pkgdir: $pkgdir" + +set -e + +tmp=$(mktemp -d) + +trap cleanup EXIT +cleanup() { + echo Cleaning up... + set +e + [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" +} + +unset CDPATH +pwd=$(pwd) + +pushd "$tmp" +git clone $url +cd $pkgdir +echo Finding git tag +gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${tag}$" || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1) +if [ -z $gittag ]; then + gittag=refs/master +fi +echo "Git Tag: $gittag" +if [ -d "test" ]; then + git archive --prefix='test/' --format=tar ${gittag}:test/ \ + | bzip2 > "$pwd"/tests-${tag}.tar.bz2 +elif [ -d "tests" ]; then + git archive --prefix='tests/' --format=tar ${gittag}:tests/ \ + | bzip2 > "$pwd"/tests-${tag}.tar.bz2 +elif [ -d "spec" ]; then + git archive --prefix='spec/' --format=tar ${gittag}:spec/ \ + | bzip2 > "$pwd"/tests-${tag}.tar.bz2 +else + echo "No test directory found for tag ${gittag}" +fi +if [ -d "support" ]; then + git archive --prefix='support/' --format=tar ${gittag}:support/ \ + | bzip2 > "$pwd"/support-${tag}.tar.bz2 +fi +if [ -d "fixture" ]; then + git archive --prefix='fixture/' --format=tar ${gittag}:fixture/ \ + | bzip2 > "$pwd"/fixture-${tag}.tar.bz2 +fi +if [ -d "examples" ]; then + git archive --prefix='examples/' --format=tar ${gittag}:examples/ \ + | bzip2 > "$pwd"/examples-${tag}.tar.bz2 +elif [ -d "example" ]; then + git archive --prefix='example/' --format=tar ${gittag}:example/ \ + | bzip2 > "$pwd"/examples-${tag}.tar.bz2 +fi +if [ -d "tasks" ]; then + git archive --prefix='tasks/' --format=tar ${gittag}:tasks/ \ + | bzip2 > "$pwd"/tasks-${tag}.tar.bz2 +fi +if [ -d "docs" ]; then + git archive --prefix='docs/' --format=tar ${gittag}:docs/ \ + | bzip2 > "$pwd"/docs-${tag}.tar.bz2 +elif [ -d "doc" ]; then + git archive --prefix='doc/' --format=tar ${gittag}:doc/ \ + | bzip2 > "$pwd"/docs-${tag}.tar.bz2 +fi +if [ -d "src" ]; then + git archive --prefix='src/' --format=tar ${gittag}:src/ \ + | bzip2 > "$pwd"/src-${tag}.tar.bz2 +elif [ -d "source" ]; then + git archive --prefix='source/' --format=tar ${gittag}:source/ \ + | bzip2 > "$pwd"/source-${tag}.tar.bz2 +fi +if [ -d "tools" ]; then + git archive --prefix='tools/' --format=tar ${gittag}:tools/ \ + | bzip2 > "$pwd"/tools-${tag}.tar.bz2 +fi +if [ -d "scripts" ]; then + git archive --prefix='scripts/' --format=tar ${gittag}:scripts/ \ + | bzip2 > "$pwd"/scripts-${tag}.tar.bz2 +fi +if [ -d "modules" ]; then + git archive --prefix='modules/' --format=tar ${gittag}:modules/ \ + | bzip2 > "$pwd"/modules-${tag}.tar.bz2 +fi +if [ -d "ts" ]; then + git archive --prefix='ts/' --format=tar ${gittag}:ts/ \ + | bzip2 > "$pwd"/ts-${tag}.tar.bz2 +fi +if [ -d "build" ]; then + git archive --prefix='build/' --format=tar ${gittag}:build/ \ + | bzip2 > "$pwd"/build-${tag}.tar.bz2 +fi +if [ -d "fixtures" ]; then + git archive --prefix='fixtures/' --format=tar ${gittag}:fixtures/ \ + | bzip2 > "$pwd"/fixtures-${tag}.tar.bz2 +fi +if [ -d "mocks" ]; then + git archive --prefix='mocks/' --format=tar ${gittag}:mocks/ \ + | bzip2 > "$pwd"/mocks-${tag}.tar.bz2 +fi +if [ -d "typings" ]; then + git archive --prefix='typings/' --format=tar ${gittag}:typings/ \ + | bzip2 > "$pwd"/typings-${tag}.tar.bz2 +fi +if [ -d "templates" ]; then + git archive --prefix='templates/' --format=tar ${gittag}:templates/ \ + | bzip2 > "$pwd"/templates-${tag}.tar.bz2 +fi +if [ -d "benchmark" ]; then + git archive --prefix='benchmark/' --format=tar ${gittag}:benchmark/ \ + | bzip2 > "$pwd"/benchmark-${tag}.tar.bz2 +fi +if [ -d "vendor" ]; then + git archive --prefix='vendor/' --format=tar ${gittag}:vendor/ \ + | bzip2 > "$pwd"/vendor-${tag}.tar.bz2 +fi +if [ -d "packages" ]; then + git archive --prefix='packages/' --format=tar ${gittag}:packages/ \ + | bzip2 > "$pwd"/packages-${tag}.tar.bz2 +fi +if [ -d "rollup" ]; then + git archive --prefix='rollup/' --format=tar ${gittag}:rollup/ \ + | bzip2 > "$pwd"/rollup-${tag}.tar.bz2 +fi +popd diff --git a/nodejs-dateformat.spec b/nodejs-dateformat.spec index 78e3ecf..aae0ce6 100644 --- a/nodejs-dateformat.spec +++ b/nodejs-dateformat.spec @@ -1,12 +1,20 @@ %global enable_tests 1 +%global packagename dateformat + Name: nodejs-dateformat -Version: 2.0.0 -Release: 3%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Steven Levithan's excellent dateFormat() function for Node.js License: MIT URL: https://github.com/felixge/node-dateformat -Source0: https://github.com/felixge/node-dateformat/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://registry.npmjs.com/%{packagename}/-/%{packagename}-%{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 + BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -24,7 +32,10 @@ according to a user-specified mask. %prep -%autosetup -n node-dateformat-%{version} +%setup -q -n package +# setup the tests +%setup -q -T -D -a 1 -n package + %build @@ -54,6 +65,9 @@ TZ=UTC %{_bindir}/mocha -R spec %changelog +* Tue Mar 06 2018 jsmith - 3.0.3-1 +- Update to upstream 3.0.3 release + * Thu Feb 08 2018 Fedora Release Engineering - 2.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 6d8e2c8..8997e41 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (nodejs-dateformat-2.0.0.tar.gz) = 7a668212db888299051fd118fb565b9d506fae90257f25d1146aad8e04c5490703d393e3b9fa4cea99c9f3a0558b426e63b94e8cb16d3e95b271c38d7c996459 +SHA512 (dateformat-3.0.3.tgz) = 8f20844ed4a5dd5319316791a3b898d452f5f607acd6de7984ca39c9a6a6e09aec9b910f2fcf54424a10472888f987f893caf666976782457c86bd6521d8dbdd +SHA512 (tests-3.0.3.tar.bz2) = 822398a7591130503a9673934fa3c71d18b7519caf7b8fa99f704301f75901d05edb15d1ffad8a028778a93b62b7e1a53bf4c55699817bad1a71072816193da4