From 7000efe305b416205e0a012683048f88b3b3929e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 3 Apr 2023 09:07:15 -0400 Subject: [PATCH] Adjust nodejs-devel Provides Signed-off-by: Stephen Gallagher --- nodejs18.spec | 8 +++++++- packaging/nodejs.spec.j2 | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/nodejs18.spec b/nodejs18.spec index eb08810..c957370 100644 --- a/nodejs18.spec +++ b/nodejs18.spec @@ -194,7 +194,9 @@ BuildRequires: unzip BuildRequires: systemtap-sdt-devel +%if 0%{?nodejs_default} Provides: nodejs = %{nodejs_envr} +%endif %if %{with bundled} Provides: bundled(libuv) = %{libuv_version} @@ -334,8 +336,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