From 64f0989a8dfa580b10ad57c70459992c1222a143 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 3 Apr 2023 09:05:25 -0400 Subject: [PATCH] Adjust nodejs-devel Provides Signed-off-by: Stephen Gallagher --- nodejs20.spec | 8 +++++++- packaging/nodejs.spec.j2 | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nodejs20.spec b/nodejs20.spec index 8081866..9adbc81 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -193,7 +193,9 @@ BuildRequires: unzip +%if 0%{?nodejs_default} Provides: nodejs = %{nodejs_envr} +%endif %if %{with bundled} Provides: bundled(libuv) = %{libuv_version} @@ -333,8 +335,12 @@ Requires: nodejs-packaging Requires: libuv-devel%{?_isa} %endif +%if 0%{?nodejs_default} Provides: nodejs-devel = %{nodejs_envr} -Conflicts: nodejs-devel +%endif + +Provides: nodejs-devel-pkg = %{nodejs_envr} +Conflicts: nodejs-devel-pkg %description -n %{pkgname}-devel diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2 index 825c91d..28a7102 100644 --- a/packaging/nodejs.spec.j2 +++ b/packaging/nodejs.spec.j2 @@ -197,7 +197,9 @@ BuildRequires: unzip BuildRequires: systemtap-sdt-devel {% endif %} +%if 0%{?nodejs_default} Provides: nodejs = %{nodejs_envr} +%endif %if %{with bundled} Provides: bundled(libuv) = %{libuv_version} @@ -345,8 +347,12 @@ Requires: nodejs-packaging Requires: libuv-devel%{?_isa} %endif +%if 0%{?nodejs_default} Provides: nodejs-devel = %{nodejs_envr} -Conflicts: nodejs-devel +%endif + +Provides: nodejs-devel-pkg = %{nodejs_envr} +Conflicts: nodejs-devel-pkg %description -n %{pkgname}-devel