From e8fa27d99cadb2259f76be06a429f1d673c810d4 Mon Sep 17 00:00:00 2001
From: Jared Smith <jsmith@fedoraproject.org>
Date: Dec 03 2019 18:54:35 +0000
Subject: Update to upstream 2.4.1 release


---

diff --git a/.gitignore b/.gitignore
index d9ed667..a04248c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /tests-1.1.4.tar.bz2
 /raw-body-2.2.0.tgz
 /tests-2.2.0.tar.bz2
+/raw-body-2.4.1.tgz
+/tests-2.4.1.tar.bz2
diff --git a/dl-tests.sh b/dl-tests.sh
index deadf6f..36f13ab 100644
--- a/dl-tests.sh
+++ b/dl-tests.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-tag=2.2.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/stream-utils/raw-body.git
-cd raw-body
-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=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-raw-body.spec b/nodejs-raw-body.spec
index 41522aa..2144bfc 100644
--- a/nodejs-raw-body.spec
+++ b/nodejs-raw-body.spec
@@ -3,8 +3,8 @@
 %global enable_tests 1
 
 Name:       nodejs-raw-body
-Version:    2.2.0
-Release:    8%{?dist}
+Version:    2.4.1
+Release:    1%{?dist}
 Summary:    Get and validate the raw body of a readable stream
 License:    MIT
 URL:        https://github.com/stream-utils/raw-body
@@ -26,7 +26,7 @@ BuildRequires:  npm(unpipe)
 %if 0%{?enable_tests}
 
 BuildRequires:  npm(bluebird)
-BuildRequires:  npm(istanbul)
+BuildRequires:  npm(http-errors)
 Buildrequires:  npm(mocha)
 BuildRequires:  npm(readable-stream)
 BuildRequires:  npm(through2)
@@ -70,8 +70,6 @@ cp -pr package.json index.js \
 
 %if 0%{?enable_tests}
 mocha --trace-deprecation --reporter spec --bail --check-leaks test/
-istanbul-js cover mocha -- --trace-deprecation --reporter dot --check-leaks test/
-istanbul-js cover mocha --report lcovonly -- --trace-deprecation --reporter spec --check-leaks test/
 %endif
 
 
@@ -81,6 +79,10 @@ istanbul-js cover mocha --report lcovonly -- --trace-deprecation --reporter spec
 %{nodejs_sitelib}/raw-body
 
 %changelog
+* Tue Dec 03 2019 Jared K. Smith <jsmith@fedoraproject.org> - 2.4.1-1
+- Update to upstream 2.4.1 release
+- Remove unnecessary calls to npm(istanbul)
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 68a8218..650450c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (raw-body-2.2.0.tgz) = 0bac67c0cd06637b4fe9cc12cc14e33c85bf3e0c70c711c0c83a0ee2ae008f27fcd13c94d9ee48b0cc2e9a825fe565e20151bbeeed920c415433ff53fbda02d2
-SHA512 (tests-2.2.0.tar.bz2) = 5fd9c79a31a1e472f2e5905d63512c24b8be2410bddd7d826516274e07c03d2231b052e84d0260b6ddb7acd6407310191d0362af6a7508cfc709f64c06a239ba
+SHA512 (raw-body-2.4.1.tgz) = f56988285ea692f03448b980d8a9e6f7eaa3f3d7be8f5cea8329fc69719defe9c076e3e8aa023d94ee7b48064d9ff072ce8e4fec98574f283d3f36896c7ef76c
+SHA512 (tests-2.4.1.tar.bz2) = d02346b9b3d3872ba86d52948f95e744d7715485d7a6922e02056484055545a0bf2be1a2597ce2b102ad45358236cb368b29fd1047b72148868a8598a5ea78be