From 4a3ab2d24215fc5e06c04e1d97b76c10f8e859b7 Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik@redhat.com>
Date: Tue, 30 Nov 2021 17:52:16 +0100
Subject: [PATCH] Resolves: RHBZ#2005419 Resolves CVE-2020-28469 Rebase to
 newest version Change source to npmjs.com

---
 .gitignore          |  1 +
 nodejs-nodemon.spec | 31 +++++++++++++++++--------------
 nodemon-tarball.sh  |  8 ++++----
 sources             |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c185ce..a221390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nodemon-v1.18.3-bundled.tar.gz
 /nodemon-v2.0.3-bundled.tar.gz
 /nodemon-v2.0.7-bundled.tar.gz
+/nodemon-v2.0.15-bundled.tar.gz
diff --git a/nodejs-nodemon.spec b/nodejs-nodemon.spec
index a22e071..5b0b3dc 100644
--- a/nodejs-nodemon.spec
+++ b/nodejs-nodemon.spec
@@ -5,11 +5,11 @@
 %global enable_tests 0
 
 Name:          nodejs-%{npm_name}
-Version:       2.0.7
+Version:       2.0.15
 Release:       1%{?dist}
 Summary:       Simple monitor script for use during development of a node.js app
 License:       MIT
-URL:           https://github.com/remy/nodemon
+URL:           https://www.npmjs.com/package/nodemon
 Source0:       %{npm_name}-v%{version}-bundled.tar.gz
 
 BuildRequires: nodejs-devel
@@ -36,18 +36,18 @@ Simple monitor script for use during development of a node.js app.
 
 For use during development of a node.js based application.
 
-nodemon will watch the files in the directory in which nodemon 
-was started, and if any files change, nodemon will automatically 
+nodemon will watch the files in the directory in which nodemon
+was started, and if any files change, nodemon will automatically
 restart your node application.
 
-nodemon does not require any changes to your code or method of 
-development. nodemon simply wraps your node application and keeps 
-an eye on any files that have changed. Remember that nodemon is a 
-replacement wrapper for node, think of it as replacing the word "node" 
+nodemon does not require any changes to your code or method of
+development. nodemon simply wraps your node application and keeps
+an eye on any files that have changed. Remember that nodemon is a
+replacement wrapper for node, think of it as replacing the word "node"
 on the command line when you run your script.
 
 %prep
-%setup -q -n %{npm_name}-%{version}
+%setup -q -n package
 
 %build
 
@@ -56,14 +56,11 @@ on the command line when you run your script.
 
 %install
 mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}
-cp -pr doc bin lib package.json website node_modules %{buildroot}%{nodejs_sitelib}/%{npm_name}
+cp -pr doc bin lib package.json node_modules %{buildroot}%{nodejs_sitelib}/%{npm_name}
 
 mkdir -p %{buildroot}%{_bindir}
 ln -sf %{nodejs_sitelib}/%{npm_name}/bin/nodemon.js %{buildroot}%{_bindir}/nodemon
 
-
-#%%nodejs_symlink_deps
-
 %if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
@@ -71,11 +68,17 @@ npm run test
 %endif
 
 %files
-%doc CODE_OF_CONDUCT.md doc faq.md README.md
+%doc doc README.md
 %{nodejs_sitelib}/%{npm_name}
 %{_bindir}/nodemon
 
 %changelog
+* Tue Nov 30 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 2.0.15-1
+- Resolves: RHBZ#2005419
+- Resolves CVE-2020-28469
+- Rebase to newest version
+- Change source to npmjs.com
+
 * Tue May 11 2021 Zuzana Svetlikova <zsvetlik@redhat.com> - 2.0.7-1
 - Resolves: RHBZ#1953991
 - Update to 2.0.7 to resolve CVE-2020-28469
diff --git a/nodemon-tarball.sh b/nodemon-tarball.sh
index e9c1502..da0b0b2 100644
--- a/nodemon-tarball.sh
+++ b/nodemon-tarball.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 version=$(rpm -q --specfile --qf='%{version}\n' nodejs-nodemon.spec | head -n1)
-wget https://github.com/remy/nodemon/archive/v$version.tar.gz
-tar -zxf v$version.tar.gz
-cd nodemon-$version
-npm install --production && cd .. && tar -zcf nodemon-v$version-bundled.tar.gz nodemon-$version
+wget https://registry.npmjs.org/nodemon/-/nodemon-$version.tgz
+tar -zxf nodemon-$version.tgz
+cd package
+npm install --production && rm -rf Dockerfile && cd .. && tar -zcf nodemon-v$version-bundled.tar.gz package
diff --git a/sources b/sources
index 21cd4dd..d56b4f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nodemon-v2.0.7-bundled.tar.gz) = e4279b3bbd620d392d3216df57f4b31214bba5cdacd4ac40689fa07677761c00c8ab5169a2162a8bb281a6737852c918a36c069e4c6c43e5cf10bf2b6774e9c0
+SHA512 (nodemon-v2.0.15-bundled.tar.gz) = 7a187493cd376940397c3f0a3bff04f56089c7b9335ab3b1a74cf5fe27a027876c155143c1a3fe636fc83d4df2194def9b58b6228880bf9e10e7646ef3e51e1d