rpms/nodejs22
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Temporarily add Node.js 20 as default for F41 and RHEL 11+"

Browse Source 
This reverts commit 3391b85e23.
This commit is contained in:
Stephen Gallagher 2024-05-21 10:00:54 -04:00
parent ba3599f538
commit 68df23fd9c
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodejs-sources.sh
View File

@ -148,14 +148,8 @@ 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"
fi
rm -rf node-v${version}.tar.gz \
@ -313,8 +307,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 +329,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

2
packaging/nodejs.spec.j2
View File

@ -44,7 +44,7 @@
# Determine if this should be the default version for this Fedora release
# The default version will own /usr/bin/node and friends
%if 0%{?fedora} == {{ FEDORA_DEFAULT_RELEASE_LOW }} || 0%{?fedora} == {{ FEDORA_DEFAULT_RELEASE_HIGH }}{{ RHEL_DEFAULT_RELEASE }}{{ TEMPORARY_RELEASE }}
%if 0%{?fedora} == {{ FEDORA_DEFAULT_RELEASE_LOW }} || 0%{?fedora} == {{ FEDORA_DEFAULT_RELEASE_HIGH }}{{ RHEL_DEFAULT_RELEASE }}
%global nodejs_default %{nodejs_pkg_major}
%endif