From dfeab1ea3dc6bf58be2960cf704a9b7c315110ea Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 15 May 2023 09:37:24 -0400 Subject: [PATCH] Fix NPM Obsoletes The version of npm shipped by nodejs20 in the frozen F38 repo is higher than the version provided by the default nodejs18. This works around that. Signed-off-by: Stephen Gallagher --- nodejs18.spec | 4 +++- packaging/nodejs.spec.j2 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nodejs18.spec b/nodejs18.spec index c9875f7..5fd35dc 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -427,7 +427,9 @@ Provides: npm(npm) = %{npm_version} Provides: npm = %{npm_envr} # Obsolete the old 'npm' package -Obsoletes: npm < 1:9 +# Due to a mistake in the original F38 repository, this needs to explicitly +# Obsoletes: the npm provided by nodejs20-npm +Obsoletes: npm < 1:9.5.1-1.20 %endif diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2 index 1be82d2..1eb28db 100644 --- a/packaging/nodejs.spec.j2 +++ b/packaging/nodejs.spec.j2 @@ -435,7 +435,9 @@ Provides: npm(npm) = %{npm_version} Provides: npm = %{npm_envr} # Obsolete the old 'npm' package -Obsoletes: npm < 1:9 +# Due to a mistake in the original F38 repository, this needs to explicitly +# Obsoletes: the npm provided by nodejs20-npm +Obsoletes: npm < 1:9.5.1-1.20 %endif