From cc18640d4b1bfe04cc50d7e338cc518d70b4a885 Mon Sep 17 00:00:00 2001
From: Jared K. Smith <jaredsmith@jaredsmith.net>
Date: Oct 03 2017 11:45:59 +0000
Subject: Update to upsteram 1.13.1 release


---

diff --git a/.gitignore b/.gitignore
index 123bc06..4418460 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /tests-v1.0.2.tar.bz2
 /serve-static-1.1.0.tgz
 /tests-v1.1.0.tar.bz2
+/serve-static-1.13.1.tgz
+/tests-1.13.1.tar.bz2
diff --git a/dl-tests.sh b/dl-tests.sh
index 6f77d35..8461795 100644
--- a/dl-tests.sh
+++ b/dl-tests.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-tag=v1.1.0
+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
 
@@ -8,6 +14,7 @@ tmp=$(mktemp -d)
 
 trap cleanup EXIT
 cleanup() {
+    echo Cleaning up...
     set +e
     [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
 }
@@ -16,8 +23,109 @@ unset CDPATH
 pwd=$(pwd)
 
 pushd "$tmp"
-git clone git://github.com/expressjs/serve-static.git
-cd serve-static
-git archive --prefix="test/" --format=tar tags/${tag}:test/ \
-    | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+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=tags/$tag
+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-serve-static.spec b/nodejs-serve-static.spec
index 7afac13..b52ffde 100644
--- a/nodejs-serve-static.spec
+++ b/nodejs-serve-static.spec
@@ -1,10 +1,11 @@
 %{?nodejs_find_provides_and_requires}
 
+# tests fail with more modern versions of NodeJS
 %global enable_tests 0
 
 Name:       nodejs-serve-static
-Version:    1.1.0
-Release:    6%{?dist}
+Version:    1.13.1
+Release:    1%{?dist}
 Summary:    Middleware for serving static files for Node.js and Connect
 License:    MIT
 Group:      System Environment/Libraries
@@ -13,7 +14,7 @@ Source0:    http://registry.npmjs.org/serve-static/-/serve-static-%{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-v%{version}.tar.bz2
+Source1:    tests-%{version}.tar.bz2
 Source10:   dl-tests.sh
 
 BuildArch:  noarch
@@ -42,10 +43,6 @@ BuildRequires:  npm(supertest)
 %setup -q -n package
 %setup -q -T -D -a 1 -n package
 
-%nodejs_fixdep parseurl '~1.0'
-%nodejs_fixdep send '~0.3'
-
-
 %build
 #nothing to do
 
@@ -58,19 +55,26 @@ cp -pr package.json index.js \
 %nodejs_symlink_deps
 
 
-%if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
-/usr/bin/mocha --require should --reporter spec
+%{__nodejs} -e 'require("./")'
+%if 0%{?enable_tests}
+%{_bindir}/mocha -R spec --require should
+%else
+%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
 %endif
 
 
 %files
-%doc History.md LICENSE Readme.md
+%doc *.md
+%license LICENSE
 %{nodejs_sitelib}/serve-static
 
 
 %changelog
+* Tue Oct 03 2017 Jared Smith <jsmith@fedoraproject.org> - 1.13.1-1
+- Update to upstream 1.13.1 release
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 2ebc077..5c6ae44 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7ccbaa006d3f8e372a06b681d78da260  serve-static-1.1.0.tgz
-c350df72970e3cc40616a150b74e4e0c  tests-v1.1.0.tar.bz2
+SHA512 (serve-static-1.13.1.tgz) = 85231466bb0f6bf234f556052706badbb24990db3436b7cbd54ceeba9f86a877d3a11d8a72c5c5ca65d257dd21a32c3733e9ac8c5b90972f98cc81ffab430695
+SHA512 (tests-1.13.1.tar.bz2) = 36a8599a8b542daa7a3080a68a849670b740c4f4e4b4c4fa9e9afdb34112ba4682597bc1bb7e0eb393f8815c2ab2e262dd3ca86c6cf982a8ed405269186b68ee