From d855e66b027d467225376ddd079e629ecadce24c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 22 Apr 2025 01:21:37 +0000
Subject: [PATCH] import UBI nodejs-18.20.6-2.module+el8.10.0+22910+33eca360

---
 SOURCES/npmrc     |  2 ++
 SPECS/nodejs.spec | 76 ++++++++---------------------------------------
 2 files changed, 14 insertions(+), 64 deletions(-)

diff --git a/SOURCES/npmrc b/SOURCES/npmrc
index 50be1d1..30b238d 100644
--- a/SOURCES/npmrc
+++ b/SOURCES/npmrc
@@ -1,2 +1,4 @@
 prefix=/usr/local
 python=/usr/bin/python3
+update-notifier=false
+
diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec
index 893a67b..f431154 100644
--- a/SPECS/nodejs.spec
+++ b/SPECS/nodejs.spec
@@ -30,7 +30,7 @@
 # This is used by both the nodejs package and the npm subpackage that
 # has a separate version - the name is special so that rpmdev-bumpspec
 # will bump this rather than adding .1 to the end.
-%global baserelease 1
+%global baserelease 2
 
 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -600,69 +600,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod
 # Make sure i18n support is working
 NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}/%{_bindir}/node --icu-data-dir=%{buildroot}%{icudatadir} %{SOURCE2}
 
-
-%pretrans -n npm -p <lua>
--- Remove all of the symlinks from the bundled npm node_modules directory
--- This scriptlet can be removed in Fedora 31
-base_path = "%{_prefix}/lib/node_modules/npm/node_modules/"
-d_st = posix.stat(base_path)
-if d_st then
-  for f in posix.files(base_path) do
-    path = base_path..f
-    st = posix.stat(path)
-    if st and st.type == "link" then
-      os.remove(path)
-    end
-  end
-end
-
--- Replace the npm docs directory with a symlink
--- Drop this scriptlet when F31 is EOL
-path = "%{_prefix}/lib/node_modules/npm/doc"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  status = os.rename(path, path .. ".rpmmoved")
-  if not status then
-    suffix = 0
-    while not status do
-      suffix = suffix + 1
-      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
-    end
-    os.rename(path, path .. ".rpmmoved")
-  end
-end
-
--- Replace the npm docs directory with a symlink
--- Drop this scriptlet when F31 is EOL
-path = "%{_prefix}/lib/node_modules/npm/html"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  status = os.rename(path, path .. ".rpmmoved")
-  if not status then
-    suffix = 0
-    while not status do
-      suffix = suffix + 1
-      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
-    end
-    os.rename(path, path .. ".rpmmoved")
-  end
-end
-
--- Replace the npm man directory with a symlink
--- Drop this scriptlet when F31 is EOL
-path = "%{_prefix}/lib/node_modules/npm/man"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  status = os.rename(path, path .. ".rpmmoved")
-  if not status then
-    suffix = 0
-    while not status do
-      suffix = suffix + 1
-      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
-    end
-    os.rename(path, path .. ".rpmmoved")
-  end
-end
+# Ensure npm's update notifier has been disabled
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
+%{buildroot}%{_bindir}/node \
+%{buildroot}%{_bindir}/npm \
+--globalconfig=%{buildroot}$(LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{buildroot}%{_bindir}/node %{buildroot}%{_bindir}/npm config get globalconfig) config ls -l --json | jq -e '.["update-notifier"] == false'
 
 
 %files
@@ -738,6 +680,12 @@ end
 
 
 %changelog
+* Thu Mar 06 2025 Andrei Radchenko <aradchen@redhat.com> - 1:18.20.6-2
+- Disable npm's update-notifier
+  Resolves: RHEL-81075
+- Remove obsolete scriplets
+  Resolves: RHEL-81120
+
 * Fri Feb 07 2025 Andrei Radchenko <aradchen@redhat.com> - 1:18.20.6-1
 - Update to version 18.20.6
   Resolves: RHEL-78326