From 91499f3a381bfb42b9b16c9c922e01f87635e403 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 21 Jun 2024 12:00:09 -0400
Subject: [PATCH] Update to 20.15.0

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 nodejs-sources.sh | 17 ++++++-----------
 nodejs20.spec     |  2 +-
 sources           |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/nodejs-sources.sh b/nodejs-sources.sh
index 32d7302..c832ca5 100755
--- a/nodejs-sources.sh
+++ b/nodejs-sources.sh
@@ -148,14 +148,10 @@ fi
 FEDORA_DEFAULT_RELEASE_LOW=$((NODE_PKG_MAJOR + 19))
 FEDORA_DEFAULT_RELEASE_HIGH=$((NODE_PKG_MAJOR + 20))
 
-if [[ $((NODE_PKG_MAJOR)) -eq 20 ]]; then
-  RHEL_DEFAULT_RELEASE=" || 0%{?rhel} == 10"
-fi
-
-# Handle the situation where the next stable release of Node.js isn't yet
-# available to include.
-if [[ $((NODE_PKG_MAJOR)) -eq 20 ]]; then
-  TEMPORARY_RELEASE=" || 0%{?fedora} == 41 || 0%{?rhel} >= 11"
+if [[ $((NODE_PKG_MAJOR)) -eq 20 ]]
+  then RHEL_DEFAULT_RELEASE=" || 0%{?rhel} == 10"
+elif [[ $((NODE_PKG_MAJOR)) -eq 22 ]];
+  then RHEL_DEFAULT_RELEASE=" || 0%{?rhel} == 11"
 fi
 
 rm -rf node-v${version}.tar.gz \
@@ -313,8 +309,7 @@ IFS='' read -r -d '' template_json <<EOF
     "NODE_PATCH": $NODE_PATCH,
     "FEDORA_DEFAULT_RELEASE_LOW": $FEDORA_DEFAULT_RELEASE_LOW,
     "FEDORA_DEFAULT_RELEASE_HIGH": $FEDORA_DEFAULT_RELEASE_HIGH,
-    "TEMPORARY_RELEASE": "$TEMPORARY_RELEASE",
-    "RHEL_DEFAULT_RELEASE": "$RHEL_DEFAULT_RELEASE",
+	"RHEL_DEFAULT_RELEASE": "$RHEL_DEFAULT_RELEASE",
     "NODE_SOVERSION": $NODE_SOVERSION,
     "V8_MAJOR": $V8_MAJOR,
     "V8_MINOR": $V8_MINOR,
@@ -336,7 +331,7 @@ IFS='' read -r -d '' template_json <<EOF
     "LEXER_VERSION": $LEXER_VERSION,
     "UNDICI_VERSION": $UNDICI_VERSION,
     "ADA_VERSION": $ADA_VERSION,
-    "PATCHES": $json_patchlist
+	"PATCHES": $json_patchlist
 }
 EOF
 
diff --git a/nodejs20.spec b/nodejs20.spec
index e43d1d4..dc328be 100644
--- a/nodejs20.spec
+++ b/nodejs20.spec
@@ -50,7 +50,7 @@
 # than a Fedora release lifecycle.
 %global nodejs_epoch 1
 %global nodejs_major 20
-%global nodejs_minor 14
+%global nodejs_minor 15
 %global nodejs_patch 0
 # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
 %global nodejs_soversion 115
diff --git a/sources b/sources
index b83a923..809418b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (node-v20.14.0-stripped.tar.gz) = 0ae935c874b273cb414c7a3eba3f0f421c7f711378b164b4a23cdc03418d11c506e5f7a45e3d4432d7d05378799715f6efd202c77752eb9ef71867633f9db784
+SHA512 (node-v20.15.0-stripped.tar.gz) = 265c3ad9ee137d7251022a9b6d5b5ad9d38121ab8373a7e7fbb85d4bd149606c3406476dfcc5914ab6f5dbda54a14773decf54e8a69fdd6b2be9dd07eeb330b6
 SHA512 (icu4c-75_1-data-bin-b.zip) = ffec0355c5e0bd210aa7da6e91845979a5f5d893c7703dba4afccfbc80613b728689fbe91d0327542faaae718940f7eb0f842b3cc7c57dddeb22b15c5f79ba2a
 SHA512 (icu4c-75_1-data-bin-l.zip) = b4dbc0986c241e43d66a90c6cf723dd8fd66281416d7d28010c952a895e8f166d980f918754b191a1e2ab468484b7d2ba2d4f6308880ef7f8bc2eecbc94844b9